if (!sid_front_equal(&global_sam_sid, &gmep.sid))
{
+ fstring sid_str;
+ sid_to_string(sid_str, &gmep.sid);
+ DEBUG(0,("UNIX User %s Primary Group is in the wrong domain! %s\n",
+ smb->unix_name, sid_str));
return NULL;
}
}
/*
- * get all the other gubbins we need
+ * get all the other gubbins we need. substitute unix name for %U
+ * as putting the nt name in is a bit meaningless.
*/
- pstrcpy(samlogon_user, user->nt_name);
+ pstrcpy(samlogon_user, user->unix_name);
if (samlogon_user[strlen(samlogon_user)-1] == '$' &&
user->group_rid != DOMAIN_GROUP_RID_USERS)
return add_smbpwd_entry(pwdb_sam_to_smb(newpwd));
}
-static struct sam_disp_info *getsamfiledispntnam(const char *name)
+static struct sam_disp_info *getsamfiledispntnam(const char *ntname)
{
- return pwdb_sam_to_dispinfo(getsam21pwntnam(name));
+ return pwdb_sam_to_dispinfo(getsam21pwntnam(ntname));
}
static struct sam_disp_info *getsamfiledisprid(uint32 rid)