summaryrefslogtreecommitdiff
path: root/source3/passdb/pdb_mysql.c
diff options
context:
space:
mode:
authorGerald Carter <jerry@samba.org>2003-09-09 04:07:32 +0000
committerGerald Carter <jerry@samba.org>2003-09-09 04:07:32 +0000
commit4093bf7ff8c8861cf7b941945ede53a8ec5bb6c8 (patch)
treedd0a9f32d9933e1f75d919b5083e007d7453f9c4 /source3/passdb/pdb_mysql.c
parent3d7cb49747a9a7f5cdec0ee05c6270ec3604202f (diff)
downloadsamba-4093bf7ff8c8861cf7b941945ede53a8ec5bb6c8.tar.gz
samba-4093bf7ff8c8861cf7b941945ede53a8ec5bb6c8.tar.bz2
samba-4093bf7ff8c8861cf7b941945ede53a8ec5bb6c8.zip
sync 3.0 into HEAD for the last time
(This used to be commit c17a7dc9a190156a069da3e861c18fd3f81224ad)
Diffstat (limited to 'source3/passdb/pdb_mysql.c')
-rw-r--r--source3/passdb/pdb_mysql.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/source3/passdb/pdb_mysql.c b/source3/passdb/pdb_mysql.c
index d3eb7cb975..6c200be504 100644
--- a/source3/passdb/pdb_mysql.c
+++ b/source3/passdb/pdb_mysql.c
@@ -240,9 +240,9 @@ static NTSTATUS row_to_sam_account(MYSQL_RES * r, SAM_ACCOUNT * u)
pdb_set_unknown_str(u, row[16], PDB_SET);
pdb_set_munged_dial(u, row[17], PDB_SET);
- string_to_sid(&sid, row[18]);
+ if(row[18])string_to_sid(&sid, row[18]);
pdb_set_user_sid(u, &sid, PDB_SET);
- string_to_sid(&sid, row[19]);
+ if(row[19])string_to_sid(&sid, row[19]);
pdb_set_group_sid(u, &sid, PDB_SET);
if (pdb_gethexpwd(row[20], temp), PDB_SET)