diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2003-06-25 12:51:58 +0000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2003-06-25 12:51:58 +0000 |
| commit | eb61c8238298e97644202139e6d7f55e46eb9c26 (patch) | |
| tree | 362bd5abff1e2d0bcfe0c00151dfae8fe776e154 /source3/include/smbldap.h | |
| parent | 23c45a79d0270f8279235058ff914060d80e49e6 (diff) | |
| download | samba-eb61c8238298e97644202139e6d7f55e46eb9c26.tar.gz samba-eb61c8238298e97644202139e6d7f55e46eb9c26.tar.xz samba-eb61c8238298e97644202139e6d7f55e46eb9c26.zip | |
Patch to move functions directly from pdb_ldap.c into lib/smbldap.c
The functions are unchanged. Next step is to make idmap_ldap use them.
Andrew Bartlett
(This used to be commit 57617a0f8c84f9ced4df2901811ce5a5a5ae005e)
Diffstat (limited to 'source3/include/smbldap.h')
| -rw-r--r-- | source3/include/smbldap.h | 40 |
1 files changed, 25 insertions, 15 deletions
diff --git a/source3/include/smbldap.h b/source3/include/smbldap.h index 31f8d33b88c..5f3606aa32c 100644 --- a/source3/include/smbldap.h +++ b/source3/include/smbldap.h @@ -19,11 +19,11 @@ */ -#ifdef HAVE_LDAP - #ifndef _SMBLDAP_H #define _SMBLDAP_H +#ifdef HAVE_LDAP + /* specify schema versions between 2.2. and 3.0 */ #define SCHEMAVER_SAMBAACCOUNT 1 @@ -93,17 +93,6 @@ typedef struct _attrib_map_entry { } ATTRIB_MAP_ENTRY; -struct smbldap_state { - LDAP *ldap_struct; - time_t last_ping; - /* retrive-once info */ - const char *uri; - char *bind_dn; - char *bind_secret; - - unsigned int num_failures; -}; - /* structures */ extern ATTRIB_MAP_ENTRY attrib_map_v22[]; @@ -120,9 +109,30 @@ extern ATTRIB_MAP_ENTRY sidmap_attr_list[]; const char* get_attr_key2string( ATTRIB_MAP_ENTRY table[], int key ); char** get_attr_list( ATTRIB_MAP_ENTRY table[] ); void free_attr_list( char **list ); -BOOL fetch_ldap_pw(char **dn, char** pw); void smbldap_set_mod (LDAPMod *** modlist, int modop, const char *attribute, const char *value); +void smbldap_make_mod(LDAP *ldap_struct, LDAPMessage *existing, + LDAPMod ***mods, + const char *attribute, const char *newval); -#endif /* _SMBLDAP_H */ +/** + * Struct to keep the state for all the ldap stuff + * + */ + +struct smbldap_state { + LDAP *ldap_struct; + time_t last_ping; + /* retrive-once info */ + const char *uri; + char *bind_dn; + char *bind_secret; + + unsigned int num_failures; +}; #endif /* HAVE_LDAP */ + +struct smbldap_state; + +#endif /* _SMBLDAP_H */ + |