* lib/tcbfuncs.c: move_dir() and shadowtcb_move() need a non NULL

	stored_tcb_user.

diff --git a/ChangeLog b/ChangeLog
index 680681fb57969e05e27b572528a1d628261ea55a..674701410a4c2734ba6cdcffb72a701e8f002dad 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -18,6 +18,8 @@
        * lib/tcbfuncs.c: Avoid integer to char conversions.
        * lib/tcbfuncs.c: Include prototypes.h for the definition of Prog.
        * lib/tcbfuncs.c: Removed dead return.
+       * lib/tcbfuncs.c: move_dir() and shadowtcb_move() need a non NULL
+       stored_tcb_user.
 
 2010-03-17  Nicolas François  <nicolas.francois@centraliens.net>
 

diff --git a/lib/tcbfuncs.c b/lib/tcbfuncs.c
index 55cb58de62d7a476e725b3ccbd8c8a38b58c0eb2..5d1082de610d4d3f466258ca36932a652fc68476 100644 (file)
--- a/lib/tcbfuncs.c
+++ b/lib/tcbfuncs.c
@@ -278,6 +278,9 @@ static shadowtcb_status move_dir(const char *user_newname, uid_t user_newid)
        struct stat oldmode;
        shadowtcb_status ret = SHADOWTCB_FAILURE;
 
+       if (NULL == stored_tcb_user) {
+               return SHADOWTCB_FAILURE;
+       }
        if (asprintf(&olddir, TCB_DIR "/%s", stored_tcb_user) == -1)
                goto out_free_nomem;
        if (stat(olddir, &oldmode) != 0) {
@@ -391,6 +394,8 @@ shadowtcb_status shadowtcb_move(/*@NULL@*/const char *user_newname, uid_t user_n
 
        if (!getdef_bool("USE_TCB"))
                return SHADOWTCB_SUCCESS;
+       if (NULL == stored_tcb_user)
+               return SHADOWTCB_FAILURE;
        if (NULL == user_newname)
                user_newname = stored_tcb_user;
        if (move_dir(user_newname, user_newid) == SHADOWTCB_FAILURE)