diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2005-09-01 00:37:52 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:36:18 -0500 |
| commit | 05db3024ba6a8cd0b3182595f4f6f2f1f0987e44 (patch) | |
| tree | fe8443867d7c286160f721cfc43609a1d8a41d51 /source4/lib/samba3 | |
| parent | b19cc95a88d236605425d7421909bbdf9f3daf70 (diff) | |
| download | samba-05db3024ba6a8cd0b3182595f4f6f2f1f0987e44.tar.gz samba-05db3024ba6a8cd0b3182595f4f6f2f1f0987e44.tar.bz2 samba-05db3024ba6a8cd0b3182595f4f6f2f1f0987e44.zip | |
r9854: Finish ldb_map testsuite
Update PLAN
Some more small other fixes
(This used to be commit de2bde2526ffaf521253e3b9e58fc11417986321)
Diffstat (limited to 'source4/lib/samba3')
| -rw-r--r-- | source4/lib/samba3/PLAN | 4 | ||||
| -rw-r--r-- | source4/lib/samba3/samba3.h | 1 | ||||
| -rw-r--r-- | source4/lib/samba3/smbpasswd.c | 5 |
3 files changed, 7 insertions, 3 deletions
diff --git a/source4/lib/samba3/PLAN b/source4/lib/samba3/PLAN index 47b5edd408..80885a4ec7 100644 --- a/source4/lib/samba3/PLAN +++ b/source4/lib/samba3/PLAN @@ -1,2 +1,4 @@ TODO (SoC project): - - finish ldb_map testsuite + - [ldb_map] some more strict checking when sending data to an LDAP server + - [ldb_map] fix rename + - fix ntPwdHash / lmPwdHash bug diff --git a/source4/lib/samba3/samba3.h b/source4/lib/samba3/samba3.h index f0f4c99513..a5f60bf1c2 100644 --- a/source4/lib/samba3/samba3.h +++ b/source4/lib/samba3/samba3.h @@ -45,7 +45,6 @@ struct samba3_samaccount { char *profile_path; char *acct_desc; char *workstations; - uid_t uid; uint32_t user_rid, group_rid, hours_len, unknown_6; uint16_t acct_ctrl, logon_divs; uint16_t bad_password_count, logon_count; diff --git a/source4/lib/samba3/smbpasswd.c b/source4/lib/samba3/smbpasswd.c index fe0780c8d3..baddb82545 100644 --- a/source4/lib/samba3/smbpasswd.c +++ b/source4/lib/samba3/smbpasswd.c @@ -228,6 +228,7 @@ NTSTATUS samba3_read_smbpasswd(const char *filename, TALLOC_CTX *ctx, struct sam for (i = 0; i < numlines; i++) { char *p = lines[i], *q; + uid_t uid; struct samba3_samaccount *acc = &((*accounts)[*count]); if (p[0] == '\0' || p[0] == '#') @@ -244,7 +245,9 @@ NTSTATUS samba3_read_smbpasswd(const char *filename, TALLOC_CTX *ctx, struct sam acc->username = talloc_strndup(ctx, p, PTR_DIFF(q, p)); p = q+1; - acc->uid = atoi(p); + uid = atoi(p); + + /* uid is ignored here.. */ q = strchr(p, ':'); if (!q) { |