/*
Unix SMB/Netbios implementation.
- Version 1.9.
+ Version 2.0.
LDAP protocol helper functions for SAMBA
Copyright (C) Jean François Micouleau 1998
+ Copyright (C) Matthew Chapman 1998
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
*/
-#ifdef USE_LDAP
-
#include "includes.h"
-#include "lber.h"
-#include "ldap.h"
+
+#ifdef WITH_LDAP
+
+#include <lber.h>
+#include <ldap.h>
extern int DEBUGLEVEL;
+/* Internal state */
+LDAP *ldap_struct;
+LDAPMessage *ldap_results;
+LDAPMessage *ldap_entry;
+
+/* LDAP password */
+static pstring ldap_secret;
+
+
/*******************************************************************
- open a connection to the ldap serve.
-******************************************************************/
-BOOL ldap_open_connection(LDAP **ldap_struct)
+ Open/close connections to the LDAP server.
+ ******************************************************************/
+
+BOOL ldap_open_connection(BOOL modify)
{
- if ( (*ldap_struct = ldap_open(lp_ldap_server(),lp_ldap_port()) )== NULL)
- {
- DEBUG(0,("%s: The LDAP server is not responding !\n",timestring()));
- return(False);
+ int err;
+
+ if (!(ldap_struct = ldap_open(lp_ldap_server(), lp_ldap_port()))) {
+ DEBUG(0, ("open: %s\n", strerror(errno)));
+ return (False);
}
- DEBUG(2,("ldap_open_connection: connection opened\n"));
+
+ err = ldap_simple_bind_s(ldap_struct, lp_ldap_bind_as(), ldap_secret);
+ if (err != LDAP_SUCCESS) {
+ DEBUG(0, ("bind: %s\n", ldap_err2string(err)));
+ return (False);
+ }
+
+ DEBUG(2,("Connected to LDAP server\n"));
return (True);
}
-
-/*******************************************************************
- connect anonymously to the ldap server.
- FIXME: later (jfm)
-******************************************************************/
-static BOOL ldap_connect_anonymous(LDAP *ldap_struct)
+void ldap_close_connection()
{
- if ( ldap_simple_bind_s(ldap_struct,lp_ldap_root(),lp_ldap_rootpasswd()) != LDAP_SUCCESS)
- {
- DEBUG(0,("%s: Couldn't bind to the LDAP server !\n", timestring() ));
- return(False);
- }
- return (True);
+ if(!ldap_struct)
+ return;
+
+ if(ldap_results) {
+ ldap_msgfree(ldap_results);
+ ldap_results = NULL; }
+
+ ldap_unbind(ldap_struct);
+ ldap_struct = NULL;
+
+ DEBUG(2,("Connection closed\n"));
}
/*******************************************************************
- connect to the ldap server under system privileg.
-******************************************************************/
-BOOL ldap_connect_system(LDAP *ldap_struct)
+ Search the directory using a given filter.
+ ******************************************************************/
+
+BOOL ldap_search_for(char *filter)
{
- if ( ldap_simple_bind_s(ldap_struct,lp_ldap_root(),lp_ldap_rootpasswd()) != LDAP_SUCCESS)
- {
- DEBUG(0,("%s: Couldn't bind to the LDAP server !\n", timestring() ));
- return(False);
+ int err;
+
+ DEBUG(2,("Searching in [%s] for [%s]\n", lp_ldap_suffix(), filter));
+
+ err = ldap_search_s(ldap_struct, lp_ldap_suffix(), LDAP_SCOPE_ONELEVEL,
+ filter, NULL, 0, &ldap_results);
+
+ if(err != LDAP_SUCCESS) {
+ DEBUG(0, ("search: %s\n", ldap_err2string(err)));
}
- DEBUG(2,("ldap_connect_system: succesfull connection to the LDAP server\n"));
+
+ DEBUG(2, ("%d matching entries found\n",
+ ldap_count_entries(ldap_struct, ldap_results)));
+
+ ldap_entry = ldap_first_entry(ldap_struct, ldap_results);
return (True);
}
-/*******************************************************************
- connect to the ldap server under a particular user.
-******************************************************************/
-static BOOL ldap_connect_user(LDAP *ldap_struct, char *user, char *password)
+BOOL ldap_search_by_name(const char *user)
{
- if ( ldap_simple_bind_s(ldap_struct,lp_ldap_root(),lp_ldap_rootpasswd()) != LDAP_SUCCESS)
- {
- DEBUG(0,("%s: Couldn't bind to the LDAP server !\n", timestring() ));
- return(False);
- }
- DEBUG(2,("ldap_connect_user: succesfull connection to the LDAP server\n"));
- return (True);
-}
+ fstring filter;
-/*******************************************************************
- run the search by name.
-******************************************************************/
-static BOOL ldap_search_one_user(LDAP *ldap_struct, char *filter, LDAPMessage **result)
-{
- int scope = LDAP_SCOPE_ONELEVEL;
- int rc;
-
- DEBUG(2,("ldap_search_one_user: searching for:[%s]\n", filter));
-
- rc=ldap_search_s(ldap_struct, lp_ldap_suffix(), scope, filter, NULL, 0, result);
-
- if (rc != LDAP_SUCCESS )
- {
- DEBUG(0,("%s: Problem during the LDAP search\n",timestring()));
- return(False);
- }
- return (True);
+ slprintf(filter, sizeof(filter)-1,
+ "(&(uid=%s)(objectclass=sambaAccount))", user);
+ return ldap_search_for(filter);
}
-/*******************************************************************
- run the search by name.
-******************************************************************/
-BOOL ldap_search_one_user_by_name(LDAP *ldap_struct, char *user, LDAPMessage **result)
-{
- pstring filter;
- /*
- in the filter expression, replace %u with the real name
- so in ldap filter, %u MUST exist :-)
- */
- strcpy(filter,lp_ldap_filter());
- string_sub(filter,"%u",user);
+BOOL ldap_search_by_uid(int uid)
+{
+ fstring filter;
- if ( !ldap_search_one_user(ldap_struct, filter, result) )
- {
- return(False);
- }
- return (True);
+ slprintf(filter, sizeof(filter)-1,
+ "(&(uidNumber=%d)(objectclass=sambaAccount))", uid);
+ return ldap_search_for(filter);
}
+
/*******************************************************************
- run the search by uid.
-******************************************************************/
-BOOL ldap_search_one_user_by_uid(LDAP *ldap_struct, int uid, LDAPMessage **result)
-{
- pstring filter;
- /*
- in the filter expression, replace %u with the real name
- so in ldap filter, %u MUST exist :-)
- */
- snprintf(filter, sizeof(pstring), "uidAccount=%d", uid);
+ Get the first value of an attribute.
+ ******************************************************************/
+
+BOOL ldap_get_attribute(char *attribute, char *value)
+{
+ char **values;
+
+ if(!(values = ldap_get_values(ldap_struct, ldap_entry, attribute)))
+ return (False);
+
+ pstrcpy(value, values[0]);
+ ldap_value_free(values);
+ DEBUG(3, ("get: [%s] = [%s]\n", attribute, value));
- if ( !ldap_search_one_user(ldap_struct, filter, result) )
- {
- return(False);
- }
return (True);
}
+
/*******************************************************************
- search an attribute and return the first value found.
-******************************************************************/
-void get_single_attribute(LDAP *ldap_struct, LDAPMessage *entry, char *attribute, char *value)
+ Contruct an smb_passwd structure
+ ******************************************************************/
+
+struct smb_passwd *ldap_getpw()
{
- char **valeurs;
-
- if ( (valeurs=ldap_get_values(ldap_struct, entry, attribute)) != NULL)
- {
- strcpy(value, valeurs[0]);
- ldap_value_free(valeurs);
- DEBUG(3,("get_single_attribute: [%s]=[%s]\n", attribute, value));
- }
+ static struct smb_passwd smbpw;
+ static pstring unix_name;
+ static pstring nt_name;
+ static unsigned char smblmpwd[16];
+ static unsigned char smbntpwd[16];
+ pstring temp;
+
+ if(!ldap_entry)
+ return NULL;
+
+ if(!ldap_get_attribute("uid", unix_name)) {
+ DEBUG(0,("Missing uid\n"));
+ return NULL; }
+ smbpw.unix_name = unix_name;
+
+ DEBUG(2,("Retrieving account [%s]\n",unix_name));
+
+ if(!ldap_get_attribute("uidNumber", temp)) {
+ DEBUG(0,("Missing uidNumber\n"));
+ return NULL; }
+ smbpw.unix_uid = atoi(temp);
+
+ if(ldap_get_attribute("ntuid", nt_name)) {
+ DEBUG(0,("Missing ntuid\n"));
+ return NULL; }
+ smbpw.nt_name = nt_name;
+
+ if(!ldap_get_attribute("rid", temp)) {
+ DEBUG(0,("Missing rid\n"));
+ return NULL; }
+ smbpw.user_rid = atoi(temp);
+
+ if(ldap_get_attribute("acctFlags", temp))
+ smbpw.acct_ctrl = pwdb_decode_acct_ctrl(temp);
else
- {
- value=NULL;
+ smbpw.acct_ctrl = ACB_NORMAL;
+
+ if(ldap_get_attribute("lmPassword", temp)) {
+ pwdb_gethexpwd(temp, smblmpwd);
+ smbpw.smb_passwd = smblmpwd;
+ } else {
+ smbpw.smb_passwd = NULL;
+ smbpw.acct_ctrl |= ACB_DISABLED;
}
-}
-/*******************************************************************
- check if the returned entry is a sambaAccount objectclass.
-******************************************************************/
-BOOL ldap_check_user(LDAP *ldap_struct, LDAPMessage *entry)
-{
- BOOL sambaAccount=False;
- char **valeur;
- int i;
-
- DEBUG(2,("ldap_check_user: "));
- valeur=ldap_get_values(ldap_struct, entry, "objectclass");
- if (valeur!=NULL)
- {
- for (i=0;valeur[i]!=NULL;i++)
- {
- if (!strcmp(valeur[i],"sambaAccount")) sambaAccount=True;
- }
+ if(ldap_get_attribute("ntPassword", temp)) {
+ pwdb_gethexpwd(temp, smbntpwd);
+ smbpw.smb_nt_passwd = smbntpwd;
+ } else {
+ smbpw.smb_nt_passwd = NULL;
}
- DEBUG(2,("%s\n",sambaAccount?"yes":"no"));
- ldap_value_free(valeur);
- return (sambaAccount);
+
+ if(ldap_get_attribute("pwdLastSet", temp))
+ smbpw.pass_last_set_time = (time_t)strtol(temp, NULL, 16);
+ else
+ smbpw.pass_last_set_time = (time_t)(-1);
+
+ ldap_entry = ldap_next_entry(ldap_struct, ldap_entry);
+ return &smbpw;
}
-/*******************************************************************
- check if the returned entry is a sambaMachine objectclass.
-******************************************************************/
-BOOL ldap_check_machine(LDAP *ldap_struct, LDAPMessage *entry)
+
+/************************************************************************
+ Adds a modification to a LDAPMod queue.
+ ************************************************************************/
+
+ void ldap_make_mod(LDAPMod ***modlist,int modop, char *attribute, char *value)
{
- BOOL sambaMachine=False;
- char **valeur;
+ LDAPMod **mods;
int i;
-
- DEBUG(2,("ldap_check_machine: "));
- valeur=ldap_get_values(ldap_struct, entry, "objectclass");
- if (valeur!=NULL)
- {
- for (i=0;valeur[i]!=NULL;i++)
- {
- if (!strcmp(valeur[i],"sambaMachine")) sambaMachine=True;
- }
- }
- DEBUG(2,("%s\n",sambaMachine?"yes":"no"));
- ldap_value_free(valeur);
- return (sambaMachine);
-}
+ int j;
-/*******************************************************************
- retrieve the user's info and contruct a smb_passwd structure.
-******************************************************************/
-static void ldap_get_user(LDAP *ldap_struct,LDAPMessage *entry,
- struct smb_passwd *ldap_passwd)
-{
- static pstring user_name;
- static unsigned char ldappwd[16];
- static unsigned char smbntpwd[16];
- char **valeur;
-
- get_single_attribute(ldap_struct, entry, "cn", user_name);
-
- DEBUG(2,("ldap_get_user: user: %s\n",user_name));
-
- if ( (valeur=ldap_get_values(ldap_struct, entry, "uidAccount")) != NULL)
- {
- ldap_passwd->smb_userid=atoi(valeur[0]);
- ldap_value_free(valeur);
- }
-
- if ( (valeur=ldap_get_values(ldap_struct, entry, "userPassword")) != NULL)
- {
- memset(smbntpwd, '\0', 16);
- E_md4hash((uchar *) valeur[0], smbntpwd);
- valeur[0][14] = '\0';
- strupper(valeur[0]);
- memset(ldappwd, '\0', 16);
- E_P16((uchar *) valeur[0], ldappwd);
- ldap_value_free(valeur);
+ DEBUG(3, ("set: [%s] = [%s]\n", attribute, value));
+
+ mods = *modlist;
+
+ if (mods == NULL) {
+ mods = (LDAPMod **)malloc(sizeof(LDAPMod *));
+ mods[0] = NULL;
}
-
- if ( (valeur=ldap_get_values(ldap_struct,entry, "userAccountControl") ) != NULL)
- {
- ldap_passwd->acct_ctrl=atoi(valeur[0]);
- if (ldap_passwd->acct_ctrl & (ACB_DOMTRUST|ACB_WSTRUST|ACB_SVRTRUST) )
- {
- DEBUG(0,("Inconsistency in the LDAP database\n"));
-
- }
- if (ldap_passwd->acct_ctrl & ACB_NORMAL)
- {
- ldap_passwd->smb_name=user_name;
- ldap_passwd->smb_passwd=ldappwd;
- ldap_passwd->smb_nt_passwd=smbntpwd;
+
+ for (i = 0; mods[i] != NULL; ++i) {
+ if (mods[i]->mod_op == modop &&
+ !strcasecmp(mods[i]->mod_type, attribute)) {
+ break;
}
- ldap_value_free(valeur);
}
- if ( (valeur=ldap_get_values(ldap_struct,entry, "pwdLastSet")) != NULL)
- {
- ldap_passwd->last_change_time=(time_t)strtol(valeur[0], NULL, 16);
- ldap_value_free(valeur);
+ if (mods[i] == NULL) {
+ mods = (LDAPMod **)realloc(mods, (i+2) * sizeof(LDAPMod *));
+ mods[i] = (LDAPMod *)malloc(sizeof(LDAPMod));
+ mods[i]->mod_op = modop;
+ mods[i]->mod_values = NULL;
+ mods[i]->mod_type = strdup(attribute);
+ mods[i+1] = NULL;
}
-}
-/*******************************************************************
- retrieve the machine's info and contruct a smb_passwd structure.
-******************************************************************/
-static void ldap_get_machine(LDAP *ldap_struct,LDAPMessage *entry,
- struct smb_passwd *ldap_passwd)
-{
- static pstring user_name;
- static unsigned char smbntpwd[16];
- char **valeur;
-
- /* by default it's a station */
- ldap_passwd->acct_ctrl = ACB_WSTRUST;
-
- get_single_attribute(ldap_struct, entry, "cn", user_name);
- DEBUG(2,("ldap_get_machine: machine: %s\n", user_name));
-
- if ( (valeur=ldap_get_values(ldap_struct, entry, "uidAccount")) != NULL)
- {
- ldap_passwd->smb_userid=atoi(valeur[0]);
- ldap_value_free(valeur);
- }
-
- if ( (valeur=ldap_get_values(ldap_struct, entry, "machinePassword")) != NULL)
- {
- gethexpwd(valeur[0],smbntpwd);
- ldap_value_free(valeur);
- }
-
- if ( (valeur=ldap_get_values(ldap_struct,entry, "machineRole") ) != NULL)
- {
- if ( !strcmp(valeur[0],"workstation") )
- ldap_passwd->acct_ctrl=ACB_WSTRUST;
- else
- if ( !strcmp(valeur[0],"server") )
- ldap_passwd->acct_ctrl=ACB_SVRTRUST;
- ldap_value_free(valeur);
+ if (value) {
+ j = 0;
+ if (mods[i]->mod_values) {
+ for (; mods[i]->mod_values[j]; j++);
+ }
+ mods[i]->mod_values = (char **)realloc(mods[i]->mod_values,
+ (j+2) * sizeof(char *));
+ mods[i]->mod_values[j] = strdup(value);
+ mods[i]->mod_values[j+1] = NULL;
}
- ldap_passwd->smb_name=user_name;
- ldap_passwd->smb_passwd=smbntpwd;
- ldap_passwd->smb_nt_passwd=smbntpwd;
+ *modlist = mods;
}
-/*******************************************************************
- find a user or a machine return a smbpass struct.
-******************************************************************/
-static struct smb_passwd *get_ldappwd_entry(char *name, int smb_userid)
-{
- LDAP *ldap_struct;
- LDAPMessage *result;
- LDAPMessage *entry;
- BOOL machine=False;
- static struct smb_passwd ldap_passwd;
+/************************************************************************
+ Queues the necessary modifications to save a smb_passwd structure
+ ************************************************************************/
- ldap_passwd.smb_name = NULL;
- ldap_passwd.smb_passwd = NULL;
- ldap_passwd.smb_nt_passwd = NULL;
-
- ldap_passwd.smb_userid = -1;
- ldap_passwd.acct_ctrl = ACB_DISABLED;
- ldap_passwd.last_change_time = 0;
+ void ldap_smbpwmods(struct smb_passwd *newpwd, LDAPMod ***mods, int operation)
+{
+ fstring temp;
+ int i;
- ldap_struct=NULL;
+ *mods = NULL;
+ if(operation == LDAP_MOD_ADD) { /* immutable attributes */
+ ldap_make_mod(mods, LDAP_MOD_ADD, "objectclass", "sambaAccount");
- if (name != NULL)
- {
- DEBUG(10, ("get_ldappwd_entry: search by name: %s\n", name));
- }
- else
- {
- DEBUG(10, ("get_ldappwd_entry: search by smb_userid: %x\n", smb_userid));
- }
+ ldap_make_mod(mods, LDAP_MOD_ADD, "uid", newpwd->unix_name);
+ slprintf(temp, sizeof(temp)-1, "%d", newpwd->unix_uid);
+ ldap_make_mod(mods, LDAP_MOD_ADD, "uidNumber", temp);
- if (!ldap_open_connection(&ldap_struct))
- return (NULL);
- if (!ldap_connect_system(ldap_struct))
- return (NULL);
-
- if (name != NULL)
- {
- if (!ldap_search_one_user_by_name(ldap_struct, name, &result))
- return (NULL);
- }
- else
- {
- if (!ldap_search_one_user_by_uid(ldap_struct, smb_userid, &result))
- return (NULL);
+ ldap_make_mod(mods, LDAP_MOD_ADD, "ntuid", newpwd->nt_name);
+ slprintf(temp, sizeof(temp)-1, "%d", newpwd->user_rid);
+ ldap_make_mod(mods, LDAP_MOD_ADD, "rid", temp);
}
-
- if (ldap_count_entries(ldap_struct, result) == 0)
- {
- DEBUG(2,("%s: Non existant user!\n", timestring() ));
- return (NULL);
+
+ if (newpwd->smb_passwd) {
+ for( i = 0; i < 16; i++) {
+ slprintf(&temp[2*i], 3, "%02X", newpwd->smb_passwd[i]);
+ }
+ ldap_make_mod(mods, operation, "lmPassword", temp);
}
-
- if (ldap_count_entries(ldap_struct, result) > 1)
- {
- DEBUG(2,("%s: Strange %d users in the base!\n",
- timestring(), ldap_count_entries(ldap_struct, result) ));
+
+ if (newpwd->smb_nt_passwd) {
+ for( i = 0; i < 16; i++) {
+ slprintf(&temp[2*i], 3, "%02X", newpwd->smb_nt_passwd[i]);
+ }
+ ldap_make_mod(mods, operation, "ntPassword", temp);
}
- /* take the first and unique entry */
- entry=ldap_first_entry(ldap_struct, result);
- if (name != NULL)
- {
- DEBUG(0,("get_ldappwd_entry: Found user: %s\n",name));
+ newpwd->pass_last_set_time = time(NULL);
+ slprintf(temp, sizeof(temp)-1, "%08X", newpwd->pass_last_set_time);
+ ldap_make_mod(mods, operation, "pwdLastSet", temp);
- if (name[strlen(name)-1]=='$')
- machine=True;
- else
- machine=False;
- }
-
- if (machine==False)
- {
- if (ldap_check_user(ldap_struct, entry)==True)
- ldap_get_user(ldap_struct, entry, &ldap_passwd);
- }
- else
- {
- if (ldap_check_machine(ldap_struct, entry)==True)
- ldap_get_machine(ldap_struct, entry, &ldap_passwd);
- }
-
- ldap_msgfree(result);
- result=NULL;
- ldap_unbind(ldap_struct);
-
- return(&ldap_passwd);
+ ldap_make_mod(mods, operation, "acctFlags",
+ pwdb_encode_acct_ctrl(newpwd->acct_ctrl,
+ NEW_PW_FORMAT_SPACE_PADDED_LEN));
}
+
/************************************************************************
- Routine to add an entry to the ldap passwd file.
+ Commit changes to a directory entry.
+ *************************************************************************/
+ BOOL ldap_makemods(char *attribute, char *value, LDAPMod **mods, BOOL add)
+{
+ pstring dn;
+ int entries;
+ int err = 0;
+ BOOL rc;
- do not call this function directly. use passdb.c instead.
+ slprintf(dn, sizeof(dn)-1, "%s=%s, %s", attribute, value,
+ lp_ldap_suffix());
-*************************************************************************/
-BOOL add_ldappwd_entry(struct smb_passwd *newpwd)
-{
- return True;
-}
+ if(!ldap_open_connection(True))
+ return (False);
-/************************************************************************
- Routine to search the ldap passwd file for an entry matching the username.
- and then modify its password entry. We can't use the startldappwent()/
- getldappwent()/endldappwent() interfaces here as we depend on looking
- in the actual file to decide how much room we have to write data.
- override = False, normal
- override = True, override XXXXXXXX'd out password or NO PASS
+ if(add)
+ err = ldap_add_s(ldap_struct, dn, mods);
- do not call this function directly. use passdb.c instead.
+ if(!add || (err = LDAP_ALREADY_EXISTS))
+ err = ldap_modify_s(ldap_struct, dn, mods);
-************************************************************************/
-BOOL mod_ldappwd_entry(struct smb_passwd* pwd, BOOL override)
-{
- return False;
-}
+ if(err == LDAP_SUCCESS) {
+ DEBUG(2,("Updated entry [%s]\n",value));
+ rc = True;
+ } else {
+ DEBUG(0,("update: %s\n", ldap_err2string(err)));
+ rc = False;
+ }
-/************************************************************************
- Routine to search ldap passwd by name.
+ ldap_close_connection();
+ ldap_mods_free(mods, 1);
+ return rc;
+}
- do not call this function directly. use passdb.c instead.
-*************************************************************************/
+/***************************************************************
+ Begin/end account enumeration.
+ ****************************************************************/
-struct smb_passwd *getldappwnam(char *name)
+static void *ldap_enumfirst(BOOL update)
{
- return get_ldappwd_entry(name, 0);
-}
-
-/************************************************************************
- Routine to search ldap passwd by uid.
+ if (!ldap_open_connection(False))
+ return NULL;
- do not call this function directly. use passdb.c instead.
+ ldap_search_for("objectclass=sambaAccount");
-*************************************************************************/
+ return ldap_struct;
+}
-struct smb_passwd *getldappwuid(unsigned int uid)
+static void ldap_enumclose(void *vp)
{
- return get_ldappwd_entry(NULL, uid);
+ ldap_close_connection();
}
-/***************************************************************
- Start to enumerate the ldap passwd list. Returns a void pointer
- to ensure no modification outside this module.
- do not call this function directly. use passdb.c instead.
+/*************************************************************************
+ Save/restore the current position in a query
+ *************************************************************************/
- ****************************************************************/
+static SMB_BIG_UINT ldap_getdbpos(void *vp)
+{
+ return (SMB_BIG_UINT)((ulong)ldap_entry);
+}
-struct ldap_enum_info
+static BOOL ldap_setdbpos(void *vp, SMB_BIG_UINT tok)
{
- LDAP *ldap_struct;
- LDAPMessage *result;
- LDAPMessage *entry;
-};
+ ldap_entry = (LDAPMessage *)((ulong)tok);
+ return (True);
+}
-static struct ldap_enum_info ldap_ent;
-void *startldappwent(BOOL update)
-{
- int scope = LDAP_SCOPE_ONELEVEL;
- int rc;
+/*************************************************************************
+ Return smb_passwd information.
+ *************************************************************************/
- char filter[256];
+static struct smb_passwd *ldap_getpwbynam(const char *name)
+{
+ struct smb_passwd *ret;
- if (!ldap_open_connection(&ldap_ent.ldap_struct)) /* open a connection to the server */
+ if(!ldap_open_connection(False))
return NULL;
- if (!ldap_connect_system(ldap_ent.ldap_struct)) /* connect as system account */
- return NULL;
+ ldap_search_by_name(name);
+ ret = ldap_getpw();
- /* when the class is known the search is much faster */
- switch (0)
- {
- case 1:
- {
- strcpy(filter, "objectclass=sambaAccount");
- break;
- }
- case 2:
- {
- strcpy(filter, "objectclass=sambaMachine");
- break;
- }
- default:
- {
- strcpy(filter, "(|(objectclass=sambaMachine)(objectclass=sambaAccount))");
- break;
- }
- }
+ ldap_close_connection();
+ return ret;
+}
- rc=ldap_search_s(ldap_ent.ldap_struct, lp_ldap_suffix(), scope, filter, NULL, 0, &ldap_ent.result);
+static struct smb_passwd *ldap_getpwbyuid(uid_t userid)
+{
+ struct smb_passwd *ret;
- DEBUG(2,("%d entries in the base!\n", ldap_count_entries(ldap_ent.ldap_struct, ldap_ent.result) ));
+ if(!ldap_open_connection(False))
+ return NULL;
- ldap_ent.entry = ldap_first_entry(ldap_ent.ldap_struct, ldap_ent.result);
+ ldap_search_by_uid(userid);
+ ret = ldap_getpw();
- return &ldap_ent;
+ ldap_close_connection();
+ return ret;
}
-/*************************************************************************
- Routine to return the next entry in the ldap passwd list.
+static struct smb_passwd *ldap_getcurrentpw(void *vp)
+{
+ return ldap_getpw();
+}
- do not call this function directly. use passdb.c instead.
+/************************************************************************
+ Modify user information given an smb_passwd struct.
*************************************************************************/
-struct smb_passwd *getldappwent(void *vp)
+static BOOL ldap_addpw(struct smb_passwd *newpwd)
{
+ LDAPMod **mods;
- struct ldap_enum_info *ldap_vp = (struct ldap_enum_info *)vp;
- ldap_vp->entry = ldap_next_entry(ldap_vp->ldap_struct, ldap_vp->entry);
-/*
- make_ldap_sam_user_info_21(ldap_struct, entry, &(pw_buf[(*num_entries)]) );
-*/
- return NULL;
+ ldap_smbpwmods(newpwd, &mods, LDAP_MOD_ADD);
+ return ldap_makemods("uid", newpwd->unix_name, mods, True);
}
-/***************************************************************
- End enumeration of the ldap passwd list.
-****************************************************************/
-void endldappwent(void *vp)
+static BOOL ldap_modpw(struct smb_passwd *pwd, BOOL override)
{
- struct ldap_enum_info *ldap_vp = (struct ldap_enum_info *)vp;
- ldap_msgfree(ldap_vp->result);
- ldap_unbind(ldap_vp->ldap_struct);
-}
+ LDAPMod **mods;
-/*************************************************************************
- Return the current position in the ldap passwd list as an unsigned long.
- This must be treated as an opaque token.
-
- do not call this function directly. use passdb.c instead.
-
-*************************************************************************/
-unsigned long getldappwpos(void *vp)
-{
- return 0;
+ ldap_smbpwmods(pwd, &mods, LDAP_MOD_REPLACE);
+ return ldap_makemods("uid", pwd->unix_name, mods, False);
}
-/*************************************************************************
- Set the current position in the ldap passwd list from unsigned long.
- This must be treated as an opaque token.
- do not call this function directly. use passdb.c instead.
+static struct smb_passdb_ops ldap_ops =
+{
+ ldap_enumfirst,
+ ldap_enumclose,
+ ldap_getdbpos,
+ ldap_setdbpos,
+
+ ldap_getpwbynam,
+ ldap_getpwbyuid,
+ ldap_getcurrentpw,
+ ldap_addpw,
+ ldap_modpw
+};
-*************************************************************************/
-BOOL setldappwpos(void *vp, unsigned long tok)
+struct smb_passdb_ops *ldap_initialise_password_db(void)
{
- return False;
+ FILE *pwdfile;
+ char *pwdfilename;
+ char *p;
+
+ pwdfilename = lp_ldap_passwd_file();
+
+ if(pwdfilename[0]) {
+ if(pwdfile = sys_fopen(pwdfilename, "r")) {
+ fgets(ldap_secret, sizeof(ldap_secret), pwdfile);
+ if(p = strchr(ldap_secret, '\n'))
+ *p = 0;
+ fclose(pwdfile);
+ } else {
+ DEBUG(0,("Failed to open LDAP passwd file\n"));
+ }
+ }
+
+ return &ldap_ops;
}
+#else
+ void ldap_dummy_function(void);
+ void ldap_dummy_function(void) { } /* stop some compilers complaining */
#endif
git.samba.org / samba.git / blobdiff