Author: ug Date: Fri Nov 28 13:30:22 2008 New Revision: 53705 URL: http://svn.opensuse.org/viewcvs/yast?rev=53705&view=rev Log: conflict in rnc file fixed Modified: trunk/security/VERSION trunk/security/package/yast2-security.changes trunk/security/src/security.rnc Modified: trunk/security/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/security/VERSION?rev=53705&r1=53704&r2=53705&view=diff ============================================================================== --- trunk/security/VERSION (original) +++ trunk/security/VERSION Fri Nov 28 13:30:22 2008 @@ -1 +1 @@ -2.17.11 +2.17.12 Modified: trunk/security/package/yast2-security.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/security/package/yast2-security.changes?rev=53705&r1=53704&r2=53705&view=diff ============================================================================== --- trunk/security/package/yast2-security.changes (original) +++ trunk/security/package/yast2-security.changes Fri Nov 28 13:30:22 2008 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Nov 28 13:29:35 CET 2008 - ug@suse.de + +- conflict in rnc file fixed +- 2.17.12 + +------------------------------------------------------------------- Thu Nov 13 15:29:31 CET 2008 - ug@suse.de - rnc file fixed Modified: trunk/security/src/security.rnc URL: http://svn.opensuse.org/viewcvs/yast/trunk/security/src/security.rnc?rev=53705&r1=53704&r2=53705&view=diff ============================================================================== --- trunk/security/src/security.rnc (original) +++ trunk/security/src/security.rnc Fri Nov 28 13:30:22 2008 @@ -18,7 +18,7 @@ gid_max = element gid_max { text } gid_min = element gid_min { text } group_encryption = element group_encryption { text } -ip_forward = element ip_forward { text } +sec_ip_forward = element ip_forward { text } ip_tcp_syncookies = element ip_tcp_syncookies { text } ipv6_forward = element ipv6_forward { text } kdm_shutdown = element kdm_shutdown { text } @@ -96,7 +96,7 @@ | userdel_postcmd | userdel_precmd | group_encryption - | ip_forward + | sec_ip_forward | displaymanager_shutdown | passwd_remember_history security = element security { y2_security* } -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org