[Pkg-shadow-commits] r3126 - in upstream/trunk: . lib
Nicolas FRANÇOIS
nekral-guest at alioth.debian.org
Thu Mar 18 00:02:04 UTC 2010
Author: nekral-guest
Date: 2010-03-18 00:02:02 +0000 (Thu, 18 Mar 2010)
New Revision: 3126
Modified:
upstream/trunk/ChangeLog
upstream/trunk/lib/tcbfuncs.c
Log:
Avoid implicit conversion of pointers .
Modified: upstream/trunk/ChangeLog
===================================================================
--- upstream/trunk/ChangeLog 2010-03-18 00:01:30 UTC (rev 3125)
+++ upstream/trunk/ChangeLog 2010-03-18 00:02:02 UTC (rev 3126)
@@ -9,6 +9,7 @@
checked.
* lib/tcbfuncs.c: Avoid implicit conversion of pointers or
integers to booleans.
+ * lib/tcbfuncs.c: Avoid assignments in comparisons.
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:01:30 UTC (rev 3125)
+++ upstream/trunk/lib/tcbfuncs.c 2010-03-18 00:02:02 UTC (rev 3126)
@@ -149,7 +149,8 @@
{
char *ret, *rel;
- if (!(rel = shadowtcb_path_rel(name, uid)))
+ rel = shadowtcb_path_rel(name, uid);
+ if (NULL == rel)
return NULL;
if (asprintf(&ret, TCB_DIR "/%s", rel) == -1) {
OUT_OF_MEMORY;
@@ -164,7 +165,8 @@
{
char *ret, *rel;
- if (!(rel = shadowtcb_path_rel_existing(name)))
+ rel = shadowtcb_path_rel_existing(name);
+ if (NULL == rel)
return NULL;
if (asprintf(&ret, TCB_DIR "/%s", rel) == -1) {
OUT_OF_MEMORY;
@@ -281,15 +283,18 @@
}
old_uid = oldmode.st_uid;
the_newid = (user_newid == -1) ? old_uid : user_newid;
- if (!(real_old_dir = shadowtcb_path_existing(stored_tcb_user)))
+ real_old_dir = shadowtcb_path_existing(stored_tcb_user);
+ if (NULL == real_old_dir)
goto out_free;
- if (!(real_new_dir = shadowtcb_path(user_newname, the_newid)))
+ real_new_dir = shadowtcb_path(user_newname, the_newid);
+ if (NULL == real_new_dir)
goto out_free;
if (strcmp(real_old_dir, real_new_dir) == 0) {
ret = SHADOWTCB_SUCCESS;
goto out_free;
}
- if (!(real_old_dir_rel = shadowtcb_path_rel_existing(stored_tcb_user)))
+ real_old_dir_rel = shadowtcb_path_rel_existing(stored_tcb_user);
+ if (NULL == real_old_dir_rel)
goto out_free;
if (mkdir_leading(user_newname, the_newid) == SHADOWTCB_FAILURE)
goto out_free;
@@ -305,9 +310,11 @@
}
if (asprintf(&newdir, TCB_DIR "/%s", user_newname) == -1)
goto out_free_nomem;
- if (!(real_new_dir_rel = shadowtcb_path_rel(user_newname, the_newid)))
+ real_new_dir_rel = shadowtcb_path_rel(user_newname, the_newid);
+ if (NULL == real_new_dir_rel)
goto out_free;
- if (strcmp(real_new_dir, newdir) != 0 && symlink(real_new_dir_rel, newdir) != 0) {
+ if ( (strcmp(real_new_dir, newdir) != 0)
+ && (symlink(real_new_dir_rel, newdir) != 0)) {
fprintf(stderr, _("%s: Cannot create symbolic link %s: %s\n"), Prog, real_new_dir_rel, strerror(errno));
goto out_free;
}
@@ -460,11 +467,12 @@
return SHADOWTCB_FAILURE;
}
shadowgid = tcbdir_stat.st_gid;
- if (getdef_bool("TCB_AUTH_GROUP") &&
- (gr = getgrnam("auth"))) {
- authgid = gr->gr_gid;
- } else {
- authgid = shadowgid;
+ authgid = shadowgid;
+ if (getdef_bool("TCB_AUTH_GROUP")) {
+ gr = getgrnam("auth");
+ if (NULL != gr) {
+ authgid = gr->gr_gid;
+ }
}
if ( (asprintf(&dir, TCB_DIR "/%s", name) == -1)
More information about the Pkg-shadow-commits
mailing list