Merge bug - still getting used to dirdiff.

diff --git a/source/smbd/password.c b/source/smbd/password.c
index 3545f41dff4f34c3a3fb8781dcbefb2c936dc7b2..baa2823732f28b064a3dac9c79e7449b9ede1bf4 100644 (file)
--- a/source/smbd/password.c
+++ b/source/smbd/password.c
@@ -189,7 +189,6 @@ NT_USER_TOKEN *create_nt_token(uid_t uid, gid_t gid, int ngroups, gid_t *groups)
        NT_USER_TOKEN *token;
        DOM_SID *psids;
        int i, psid_ndx = 0;
-       int i;
 
        if ((token = (NT_USER_TOKEN *)malloc( sizeof(NT_USER_TOKEN) ) ) == NULL)
                return NULL;