[Pkg-shadow-commits] r3137 - in upstream/trunk: . lib

[Nicolas FRANÇOIS]

Author: nekral-guest
Date: 2010-03-18 00:05:57 +0000 (Thu, 18 Mar 2010)
New Revision: 3137

Modified:
   upstream/trunk/ChangeLog
   upstream/trunk/lib/tcbfuncs.c
Log:
	* lib/tcbfuncs.c: Avoid implicit int to mode_t conversion.

Modified: upstream/trunk/ChangeLog
===================================================================
--- upstream/trunk/ChangeLog	2010-03-18 00:05:35 UTC (rev 3136)
+++ upstream/trunk/ChangeLog	2010-03-18 00:05:57 UTC (rev 3137)
@@ -20,6 +20,7 @@
 	* lib/tcbfuncs.c: Removed dead return.
 	* lib/tcbfuncs.c: move_dir() and shadowtcb_move() need a non NULL
 	stored_tcb_user.
+	* lib/tcbfuncs.c: Avoid implicit int to mode_t conversion.
 
 2010-03-17  Nicolas François  <nicolas.francois at centraliens.net>
 

Modified: upstream/trunk/lib/tcbfuncs.c
===================================================================
--- upstream/trunk/lib/tcbfuncs.c	2010-03-18 00:05:35 UTC (rev 3136)
+++ upstream/trunk/lib/tcbfuncs.c	2010-03-18 00:05:57 UTC (rev 3137)
@@ -502,7 +502,7 @@
 		fprintf(stderr, _("%s: Cannot change owner of %s: %s\n"), Prog, shadow, strerror(errno));
 		goto out_free;
 	}
-	if (chmod(shadow, authgid == shadowgid ? 0600 : 0640) != 0) {
+	if (chmod(shadow, (mode_t) ((authgid == shadowgid) ? 0600 : 0640)) != 0) {
 		fprintf(stderr, _("%s: Cannot change mode of %s: %s\n"), Prog, shadow, strerror(errno));
 		goto out_free;
 	}
@@ -510,7 +510,7 @@
 		fprintf(stderr, _("%s: Cannot change owner of %s: %s\n"), Prog, dir, strerror(errno));
 		goto out_free;
 	}
-	if (chmod(dir, authgid == shadowgid ? 02700 : 02710) != 0) {
+	if (chmod(dir, (mode_t) ((authgid == shadowgid) ? 02700 : 02710)) != 0) {
 		fprintf(stderr, _("%s: Cannot change mode of %s: %s\n"), Prog, dir, strerror(errno));
 		goto out_free;
 	}