summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuke Leighton <lkcl@samba.org>1998-05-18 17:15:21 +0000
committerLuke Leighton <lkcl@samba.org>1998-05-18 17:15:21 +0000
commit29644e4b35c50047d95f188e6dfbc4b9f0811620 (patch)
treec0ac0b2de1bd0d1875789028993243188ac9264a
parentb40d52d64039c75bf89dee52044314f5f6738c7c (diff)
downloadsamba-29644e4b35c50047d95f188e6dfbc4b9f0811620.tar.gz
samba-29644e4b35c50047d95f188e6dfbc4b9f0811620.tar.bz2
samba-29644e4b35c50047d95f188e6dfbc4b9f0811620.zip
linker errors with -DUSE_NISPLUS_DB - difficult to spot when you're not
using nis+ on your system, so you get 100 linker errors... (This used to be commit e325d9a81039152e8c57f7fab6cf948d8e1ec7d3)
-rw-r--r--source3/passdb/nispass.c4
-rw-r--r--source3/passdb/passdb.c4
2 files changed, 4 insertions, 4 deletions
diff --git a/source3/passdb/nispass.c b/source3/passdb/nispass.c
index 5c906c53e7..22206789fc 100644
--- a/source3/passdb/nispass.c
+++ b/source3/passdb/nispass.c
@@ -392,7 +392,7 @@ static BOOL make_sam_from_nisp(struct sam_passwd *pw_buf, nis_result *result)
/* Check the lanman password column. */
p = (uchar *)ENTRY_VAL(obj, NPF_LMPWD);
- if (strlen((char *)p) != 32 || !gethexpwd((char *)p, (char *)smbpwd))
+ if (strlen((char *)p) != 32 || !pdb_gethexpwd((char *)p, (char *)smbpwd))
{
DEBUG(0, ("make_smb_from_nisp: malformed LM pwd entry.\n"));
return False;
@@ -400,7 +400,7 @@ static BOOL make_sam_from_nisp(struct sam_passwd *pw_buf, nis_result *result)
/* Check the NT password column. */
p = (uchar *)ENTRY_VAL(obj, NPF_NTPWD);
- if (strlen((char *)p) != 32 || !gethexpwd((char *)p, (char *)smbntpwd))
+ if (strlen((char *)p) != 32 || !pdb_gethexpwd((char *)p, (char *)smbntpwd))
{
DEBUG(0, ("make_smb_from_nisp: malformed NT pwd entry\n"));
return False;
diff --git a/source3/passdb/passdb.c b/source3/passdb/passdb.c
index 794560c829..2fa9a73dda 100644
--- a/source3/passdb/passdb.c
+++ b/source3/passdb/passdb.c
@@ -404,7 +404,7 @@ static struct smb_passwd *_getsampwuid(uid_t smb_userid)
DEBUG(10, ("getsampwuid: found by smb_userid: %x\n", smb_userid));
}
- endsmbpwent(fp);
+ endsampwent(fp);
return pwd;
}
@@ -436,7 +436,7 @@ static struct sam_passwd *_getsam21pwrid(uint32 rid)
DEBUG(10, ("_getsam21pwrid: found by smb_userid: %x\n", rid));
}
- endsmbpwent(fp);
+ endsampwent(fp);
return pwd;
}