[Pkg-shadow-commits] r2529 - in upstream/trunk: . src

[nekral-guest at alioth.debian.org]

Author: nekral-guest
Date: 2009-03-15 21:38:08 +0000 (Sun, 15 Mar 2009)
New Revision: 2529

Modified:
   upstream/trunk/ChangeLog
   upstream/trunk/src/groupmod.c
Log:
	* src/groupmod.c: Embed gshadow related cleanup in #ifdef
	SHADOWGRP.


Modified: upstream/trunk/ChangeLog
===================================================================
--- upstream/trunk/ChangeLog	2009-03-15 21:34:20 UTC (rev 2528)
+++ upstream/trunk/ChangeLog	2009-03-15 21:38:08 UTC (rev 2529)
@@ -1,5 +1,10 @@
 2009-03-15  Nicolas François  <nicolas.francois at centraliens.net>
 
+	* src/groupmod.c: Embed gshadow related cleanup in #ifdef
+	SHADOWGRP.
+
+2009-03-15  Nicolas François  <nicolas.francois at centraliens.net>
+
 	* src/usermod.c: get_number() replaced by getlong().
 	* src/usermod.c: When the user is renamed, make sure we do not
 	override an user with the same name (in passwd or shadow).

Modified: upstream/trunk/src/groupmod.c
===================================================================
--- upstream/trunk/src/groupmod.c	2009-03-15 21:34:20 UTC (rev 2528)
+++ upstream/trunk/src/groupmod.c	2009-03-15 21:38:08 UTC (rev 2529)
@@ -81,7 +81,9 @@
 
 struct cleanup_info_mod info_passwd;
 struct cleanup_info_mod info_group;
+#ifdef	SHADOWGRP
 struct cleanup_info_mod info_gshadow;
+#endif
 
 static bool
     oflg = false,		/* permit non-unique group ID to be specified with -g */
@@ -473,31 +475,41 @@
 static void prepare_failure_reports (void)
 {
 	info_group.name   = group_name;
+#ifdef	SHADOWGRP
 	info_gshadow.name = group_name;
+#endif
 	info_passwd.name  = group_name;
 
 	info_group.audit_msg   = xmalloc (512);
+#ifdef	SHADOWGRP
 	info_gshadow.audit_msg = xmalloc (512);
+#endif
 	info_passwd.audit_msg  = xmalloc (512);
 
 	snprintf (info_group.audit_msg, 511,
 	          "changing %s; ", gr_dbname ());
+#ifdef	SHADOWGRP
 	snprintf (info_gshadow.audit_msg, 511,
 	          "changing %s; ", sgr_dbname ());
+#endif
 	snprintf (info_passwd.audit_msg, 511,
 	          "changing %s; ", pw_dbname ());
 
 	info_group.action   =   info_group.audit_msg
 	                      + strlen (info_group.audit_msg);
+#ifdef	SHADOWGRP
 	info_gshadow.action =   info_gshadow.audit_msg
 	                      + strlen (info_gshadow.audit_msg);
+#endif
 	info_passwd.action  =   info_passwd.audit_msg
 	                      + strlen (info_passwd.audit_msg);
 
 	snprintf (info_group.action,   511 - strlen (info_group.audit_msg),
 	          "group %s/%d", group_name, group_id);
+#ifdef	SHADOWGRP
 	snprintf (info_gshadow.action, 511 - strlen (info_group.audit_msg),
 	          "group %s", group_name);
+#endif
 	snprintf (info_passwd.action,  511 - strlen (info_group.audit_msg),
 	          "group %s/%d", group_name, group_id);
 
@@ -507,10 +519,12 @@
 		strncat (info_group.action, group_newname,
 		         511 - strlen (info_group.audit_msg));
 
+#ifdef	SHADOWGRP
 		strncat (info_gshadow.action, ", new name: ",
 		         511 - strlen (info_gshadow.audit_msg));
 		strncat (info_gshadow.action, group_newname,
 		         511 - strlen (info_gshadow.audit_msg));
+#endif
 
 		strncat (info_passwd.action, ", new name: ",
 		         511 - strlen (info_passwd.audit_msg));
@@ -521,8 +535,10 @@
 		strncat (info_group.action, ", new password",
 		         511 - strlen (info_group.audit_msg));
 
+#ifdef	SHADOWGRP
 		strncat (info_gshadow.action, ", new password",
 		         511 - strlen (info_gshadow.audit_msg));
+#endif
 	}
 	if (gflg) {
 		strncat (info_group.action, ", new gid: ",
@@ -538,15 +554,19 @@
 		          "%d", group_newid);
 	}
 	info_group.audit_msg[511]   = '\0';
+#ifdef	SHADOWGRP
 	info_gshadow.audit_msg[511] = '\0';
+#endif
 	info_passwd.audit_msg[511]  = '\0';
 
 // FIXME: add a system cleanup
 	add_cleanup (cleanup_report_mod_group, &info_group);
+#ifdef	SHADOWGRP
 	if (   is_shadow_grp
 	    && (pflg || nflg)) {
 		add_cleanup (cleanup_report_mod_gshadow, &info_gshadow);
 	}
+#endif
 	if (gflg) {
 		add_cleanup (cleanup_report_mod_passwd, &info_passwd);
 	}