oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

Fix compiling hdb ldap as a module

Browse Source 
Signed-off-by: Love Hörnquist Åstrand <lha@h5l.org>
This commit is contained in:
Jeffrey Clark
2014-01-10 13:18:06 -06:00
committed by Love Hörnquist Åstrand
parent d8d0e659ce
commit c1c7da7f79
1 changed files with 10 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
lib/hdb/hdb-ldap.c
View File

@@ -44,6 +44,9 @@
static krb5_error_code LDAP__connect(krb5_context context, HDB *); static krb5_error_code LDAP__connect(krb5_context context, HDB *);
static krb5_error_code LDAP_close(krb5_context context, HDB *); static krb5_error_code LDAP_close(krb5_context context, HDB *);
static krb5_error_code hdb_ldap_create(krb5_context context, HDB **, const char *);
static krb5_error_code hdb_ldapi_create(krb5_context context, HDB **, const char *);
static krb5_error_code static krb5_error_code
LDAP_message2entry(krb5_context context, HDB * db, LDAPMessage * msg, LDAP_message2entry(krb5_context context, HDB * db, LDAPMessage * msg,
int flags, hdb_entry_ex * ent); int flags, hdb_entry_ex * ent);
@@ -803,10 +806,10 @@ need_quote(unsigned char c)
(c == 0x7f); (c == 0x7f);
} }
const static char hexchar[] = "0123456789ABCDEF"; static const char hexchar[] = "0123456789ABCDEF";
static krb5_error_code static krb5_error_code
escape_value(krb5_context context, const unsigned char *unquoted, char **quoted) escape_value(krb5_context context, const char *unquoted, char **quoted)
{ {
size_t i, len; size_t i, len;
@@ -822,7 +825,7 @@ escape_value(krb5_context context, const unsigned char *unquoted, char **quoted)
} }
for (i = 0; unquoted[0] ; unquoted++) { for (i = 0; unquoted[0] ; unquoted++) {
if (need_quote((unsigned char *)unquoted[0])) { if (need_quote((unsigned char)unquoted[0])) {
(*quoted)[i++] = '\\'; (*quoted)[i++] = '\\';
(*quoted)[i++] = hexchar[(unquoted[0] >> 4) & 0xf]; (*quoted)[i++] = hexchar[(unquoted[0] >> 4) & 0xf];
(*quoted)[i++] = hexchar[(unquoted[0] ) & 0xf]; (*quoted)[i++] = hexchar[(unquoted[0] ) & 0xf];
@@ -1019,7 +1022,6 @@ LDAP_message2entry(krb5_context context, HDB * db, LDAPMessage * msg,
keys = ldap_get_values_len(HDB2LDAP(db), msg, "krb5Key"); keys = ldap_get_values_len(HDB2LDAP(db), msg, "krb5Key");
if (keys != NULL) { if (keys != NULL) {
int i;
size_t l; size_t l;
ent->entry.keys.len = ldap_count_values_len(keys); ent->entry.keys.len = ldap_count_values_len(keys);
@@ -1051,8 +1053,6 @@ LDAP_message2entry(krb5_context context, HDB * db, LDAPMessage * msg,
vals = ldap_get_values_len(HDB2LDAP(db), msg, "krb5EncryptionType"); vals = ldap_get_values_len(HDB2LDAP(db), msg, "krb5EncryptionType");
if (vals != NULL) { if (vals != NULL) {
int i;
ent->entry.etypes = malloc(sizeof(*(ent->entry.etypes))); ent->entry.etypes = malloc(sizeof(*(ent->entry.etypes)));
if (ent->entry.etypes == NULL) { if (ent->entry.etypes == NULL) {
ret = ENOMEM; ret = ENOMEM;
@@ -1095,8 +1095,6 @@ LDAP_message2entry(krb5_context context, HDB * db, LDAPMessage * msg,
ret = LDAP_get_string_value(db, msg, "sambaNTPassword", &ntPasswordIN); ret = LDAP_get_string_value(db, msg, "sambaNTPassword", &ntPasswordIN);
if (ret == 0 && have_arcfour == 0) { if (ret == 0 && have_arcfour == 0) {
unsigned *etypes; unsigned *etypes;
Key *keys;
int i;
keys = realloc(ent->entry.keys.val, keys = realloc(ent->entry.keys.val,
(ent->entry.keys.len + 1) * sizeof(ent->entry.keys.val[0])); (ent->entry.keys.len + 1) * sizeof(ent->entry.keys.val[0]));
@@ -1342,7 +1340,6 @@ LDAP_message2entry(krb5_context context, HDB * db, LDAPMessage * msg,
*/ */
int i;
int flags_len = strlen(samba_acct_flags); int flags_len = strlen(samba_acct_flags);
if (flags_len < 2) if (flags_len < 2)
@@ -1999,13 +1996,14 @@ hdb_ldapi_create(krb5_context context, HDB ** db, const char *arg)
#ifdef OPENLDAP_MODULE #ifdef OPENLDAP_MODULE
static krb5_error_code KRB5_LIB_CALL * static krb5_error_code
init(krb5_context context, void **ctx) init(krb5_context context, void **ctx)
{ {
*ctx = NULL; *ctx = NULL;
return 0;
} }
static void KRB5_LIB_CALL * static void
fini(void *ctx) fini(void *ctx)
{ {
} }
@@ -2018,7 +2016,7 @@ struct hdb_method hdb_ldap_interface = {
hdb_ldap_create hdb_ldap_create
}; };
struct hdb_so_method hdb_ldapi_interface = { struct hdb_method hdb_ldapi_interface = {
HDB_INTERFACE_VERSION, HDB_INTERFACE_VERSION,
init, init,
fini, fini,