diff options
| -rw-r--r-- | source/passdb/nispass.c | 10 | ||||
| -rw-r--r-- | source/passdb/tdbpass.c | 8 |
2 files changed, 9 insertions, 9 deletions
diff --git a/source/passdb/nispass.c b/source/passdb/nispass.c index 4b4e281c29d..007ae10d06d 100644 --- a/source/passdb/nispass.c +++ b/source/passdb/nispass.c @@ -636,10 +636,10 @@ static BOOL add_nisp21pwd_entry(struct sam_passwd *newpwd) slprintf(pwdlchg_t, 13, "CCT-%08X", (uint32)newpwd->pass_can_change_time); slprintf(pwdmchg_t, 13, "MCT-%08X", (uint32)newpwd->pass_must_change_time); - slprintf(uid, sizeof(uid), "%u", newpwd->smb_userid); - slprintf(user_rid, sizeof(user_rid), "0x%x", newpwd->user_rid); - slprintf(smb_grpid, sizeof(smb_grpid), "%u", newpwd->smb_grpid); - slprintf(group_rid, sizeof(group_rid), "0x%x", newpwd->group_rid); + slprintf(uid, sizeof(uid)-1, "%u", newpwd->smb_userid); + slprintf(user_rid, sizeof(user_rid)-1, "0x%x", newpwd->user_rid); + slprintf(smb_grpid, sizeof(smb_grpid)-1, "%u", newpwd->smb_grpid); + slprintf(group_rid, sizeof(group_rid)-1, "0x%x", newpwd->group_rid); safe_strcpy(acb, pdb_encode_acct_ctrl(newpwd->acct_ctrl, NEW_PW_FORMAT_SPACE_PADDED_LEN), sizeof(acb)-1); @@ -868,7 +868,7 @@ static BOOL mod_nisp21pwd_entry(struct sam_passwd* pwd, BOOL override) pwd->pass_last_set_time = time(NULL); if(got_pass_last_set_time) { - slprintf(lct, 12, "LCT-%08X", (uint32)pwd->pass_last_set_time); + slprintf(lct, 13, "LCT-%08X", (uint32)pwd->pass_last_set_time); } set_single_attribute(obj, NPF_LMPWD, lmpwd, strlen(lmpwd), EN_CRYPT); diff --git a/source/passdb/tdbpass.c b/source/passdb/tdbpass.c index 8f24e9b471e..157a7ee59e7 100644 --- a/source/passdb/tdbpass.c +++ b/source/passdb/tdbpass.c @@ -183,7 +183,7 @@ static BOOL del_samtdbpwd_entry(const char *name) return False; } - slprintf(keystr, sizeof(keystr), "USER_%s", name); + slprintf(keystr, sizeof(keystr)-1, "USER_%s", name); dos_to_unix(keystr, True); /* Convert key to unix-codepage */ key.dptr = keystr; key.dsize = strlen (keystr) + 1; @@ -289,7 +289,7 @@ static BOOL mod_samtdb21pwd_entry(struct sam_passwd* newpwd, BOOL override) if (newpwd->munged_dial) memcpy (tdb_entry->strings + tdb_entry->munged_dial_offset, newpwd->munged_dial, munged_dial_len); - slprintf(keystr, sizeof(keystr), "USER_%s", newpwd->smb_name); + slprintf(keystr, sizeof(keystr)-1, "USER_%s", newpwd->smb_name); dos_to_unix(keystr, True); /* Convert key to unix-codepage */ key.dptr = keystr; key.dsize = strlen (keystr) + 1; @@ -400,7 +400,7 @@ static BOOL add_samtdb21pwd_entry(struct sam_passwd *newpwd) if (newpwd->munged_dial) memcpy (tdb_entry->strings + tdb_entry->munged_dial_offset, newpwd->munged_dial, munged_dial_len); - slprintf(keystr, sizeof(keystr), "USER_%s", newpwd->smb_name); + slprintf(keystr, sizeof(keystr)-1, "USER_%s", newpwd->smb_name); dos_to_unix(keystr, True); /* Convert key to unix-codepage */ key.dptr = keystr; key.dsize = strlen (keystr) + 1; @@ -462,7 +462,7 @@ static struct sam_passwd *getsamtdb21pwnam(char *name) return False; } - slprintf(keystr, sizeof(keystr), "USER_%s", name); + slprintf(keystr, sizeof(keystr)-1, "USER_%s", name); dos_to_unix(keystr, True); /* Convert key to unix-codepage */ key.dptr = keystr; key.dsize = strlen (keystr) + 1; |