Changeset 740 for vendor/current/source3/lib/smbldap.c

Timestamp:

Nov 14, 2012, 12:59:34 PM (13 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: update vendor to 3.6.0

File:

• vendor/current/source3/lib/smbldap.c (modified) (30 diffs)

vendor/current/source3/lib/smbldap.c

@@ -25 +25 @@
 #include "includes.h"
 #include "smbldap.h"
-
-#ifndef LDAP_OPT_SUCCESS
-#define LDAP_OPT_SUCCESS 0
-#endif
+#include "secrets.h"
+#include "../libcli/security/security.h"
 
 /* Try not to hit the up or down server forever */
@@ -508 +506 @@
  ***********************************************************************/
 
- void smbldap_set_mod (LDAPMod *** modlist, int modop, const char *attribute, const char *value)
+static void smbldap_set_mod_internal(LDAPMod *** modlist, int modop, const char *attribute, const char *value, const DATA_BLOB *blob)
 {
         LDAPMod **mods;
@@ -559 +557 @@
         }
 
-        if (value != NULL) {
+        if (blob && (modop & LDAP_MOD_BVALUES)) {
+                j = 0;
+                if (mods[i]->mod_bvalues != NULL) {
+                        for (; mods[i]->mod_bvalues[j] != NULL; j++);
+                }
+                mods[i]->mod_bvalues = SMB_REALLOC_ARRAY(mods[i]->mod_bvalues, struct berval *, j + 2);
+
+                if (mods[i]->mod_bvalues == NULL) {
+                        smb_panic("smbldap_set_mod: out of memory!");
+                        /* notreached. */
+                }
+
+                mods[i]->mod_bvalues[j] = SMB_MALLOC_P(struct berval);
+                SMB_ASSERT(mods[i]->mod_bvalues[j] != NULL);
+
+                mods[i]->mod_bvalues[j]->bv_val = (char *)memdup(blob->data, blob->length);
+                SMB_ASSERT(mods[i]->mod_bvalues[j]->bv_val != NULL);
+                mods[i]->mod_bvalues[j]->bv_len = blob->length;
+
+                mods[i]->mod_bvalues[j + 1] = NULL;
+        } else if (value != NULL) {
                 char *utf8_value = NULL;
                 size_t converted_size;
@@ -586 +604 @@
         }
         *modlist = mods;
+}
+
+ void smbldap_set_mod (LDAPMod *** modlist, int modop, const char *attribute, const char *value)
+{
+        smbldap_set_mod_internal(modlist, modop, attribute, value, NULL);
+}
+
+ void smbldap_set_mod_blob(LDAPMod *** modlist, int modop, const char *attribute, const DATA_BLOB *value)
+{
+        smbldap_set_mod_internal(modlist, modop | LDAP_MOD_BVALUES, attribute, NULL, value);
 }
 
@@ -593 +621 @@
 *********************************************************************/
 
- void smbldap_make_mod(LDAP *ldap_struct, LDAPMessage *existing,
-                      LDAPMod ***mods,
-                      const char *attribute, const char *newval)
+static void smbldap_make_mod_internal(LDAP *ldap_struct, LDAPMessage *existing,
+                                      LDAPMod ***mods,
+                                      const char *attribute, int op,
+                                      const char *newval,
+                                      const DATA_BLOB *newblob)
 {
         char oldval[2048]; /* current largest allowed value is mungeddial */
         bool existed;
+        DATA_BLOB oldblob = data_blob_null;
 
         if (attribute == NULL) {
@@ -607 +638 @@
 
         if (existing != NULL) {
-                existed = smbldap_get_single_attribute(ldap_struct, existing, attribute, oldval, sizeof(oldval));
+                if (op & LDAP_MOD_BVALUES) {
+                        existed = smbldap_talloc_single_blob(talloc_tos(), ldap_struct, existing, attribute, &oldblob);
+                } else {
+                        existed = smbldap_get_single_attribute(ldap_struct, existing, attribute, oldval, sizeof(oldval));
+                }
         } else {
                 existed = False;
@@ -613 +648 @@
         }
 
-        /* all of our string attributes are case insensitive */
-
-        if (existed && newval && (StrCaseCmp(oldval, newval) == 0)) {
-
-                /* Believe it or not, but LDAP will deny a delete and
-                   an add at the same time if the values are the
-                   same... */
-                DEBUG(10,("smbldap_make_mod: attribute |%s| not changed.\n", attribute));
-                return;
-        }
-
         if (existed) {
+                bool equal = false;
+                if (op & LDAP_MOD_BVALUES) {
+                        equal = (newblob && (data_blob_cmp(&oldblob, newblob) == 0));
+                } else {
+                        /* all of our string attributes are case insensitive */
+                        equal = (newval && (StrCaseCmp(oldval, newval) == 0));
+                }
+
+                if (equal) {
+                        /* Believe it or not, but LDAP will deny a delete and
+                           an add at the same time if the values are the
+                           same... */
+                        DEBUG(10,("smbldap_make_mod: attribute |%s| not changed.\n", attribute));
+                        return;
+                }
+
                 /* There has been no value before, so don't delete it.
                  * Here's a possible race: We might end up with
@@ -636 +676 @@
                  * you could add new value */
 
-                DEBUG(10,("smbldap_make_mod: deleting attribute |%s| values |%s|\n", attribute, oldval));
-                smbldap_set_mod(mods, LDAP_MOD_DELETE, attribute, oldval);
+                if (op & LDAP_MOD_BVALUES) {
+                        DEBUG(10,("smbldap_make_mod: deleting attribute |%s| blob\n", attribute));
+                        smbldap_set_mod_blob(mods, LDAP_MOD_DELETE, attribute, &oldblob);
+                } else {
+                        DEBUG(10,("smbldap_make_mod: deleting attribute |%s| values |%s|\n", attribute, oldval));
+                        smbldap_set_mod(mods, LDAP_MOD_DELETE, attribute, oldval);
+                }
         }
 
@@ -644 +689 @@
            the old value, should it exist. */
 
-        if ((newval != NULL) && (strlen(newval) > 0)) {
-                DEBUG(10,("smbldap_make_mod: adding attribute |%s| value |%s|\n", attribute, newval));
-                smbldap_set_mod(mods, LDAP_MOD_ADD, attribute, newval);
-        }
+        if (op & LDAP_MOD_BVALUES) {
+                if (newblob && newblob->length) {
+                        DEBUG(10,("smbldap_make_mod: adding attribute |%s| blob\n", attribute));
+                        smbldap_set_mod_blob(mods, LDAP_MOD_ADD, attribute, newblob);
+                }
+        } else {
+                if ((newval != NULL) && (strlen(newval) > 0)) {
+                        DEBUG(10,("smbldap_make_mod: adding attribute |%s| value |%s|\n", attribute, newval));
+                        smbldap_set_mod(mods, LDAP_MOD_ADD, attribute, newval);
+                }
+        }
+}
+
+ void smbldap_make_mod(LDAP *ldap_struct, LDAPMessage *existing,
+                      LDAPMod ***mods,
+                      const char *attribute, const char *newval)
+{
+        smbldap_make_mod_internal(ldap_struct, existing, mods, attribute,
+                                  0, newval, NULL);
+}
+
+ void smbldap_make_mod_blob(LDAP *ldap_struct, LDAPMessage *existing,
+                            LDAPMod ***mods,
+                            const char *attribute, const DATA_BLOB *newblob)
+{
+        smbldap_make_mod_internal(ldap_struct, existing, mods, attribute,
+                                  LDAP_MOD_BVALUES, NULL, newblob);
 }
 
@@ -745 +813 @@
 *******************************************************************/
 
-int smb_ldap_setup_conn(LDAP **ldap_struct, const char *uri)
+static int smb_ldap_setup_conn(LDAP **ldap_struct, const char *uri)
 {
         int rc;
@@ -849 +917 @@
  *******************************************************************/
 
-int smb_ldap_upgrade_conn(LDAP *ldap_struct, int *new_version) 
+static int smb_ldap_upgrade_conn(LDAP *ldap_struct, int *new_version)
 {
         int version;
@@ -962 +1030 @@
 {
         struct smbldap_state *ldap_state = arg;
+        struct timespec ts;
 
         /** @TODO Should we be doing something to check what servers we rebind to?
@@ -994 +1063 @@
         }
 
-        GetTimeOfDay(&ldap_state->last_rebind);
+        clock_gettime_mono(&ts);
+        ldap_state->last_rebind = convert_timespec_to_timeval(ts);
 
         return 0;
@@ -1014 +1084 @@
                 (struct smbldap_state *)arg;
         int rc;
+        struct timespec ts;
         int version;
 
@@ -1046 +1117 @@
                                 "setting last_rebind timestamp "
                                 "(req: 0x%02x)\n", (unsigned int)request));
-                        GetTimeOfDay(&ldap_state->last_rebind);
+                        clock_gettime_mono(&ts);
+                        ldap_state->last_rebind = convert_timespec_to_timeval(ts);
                         break;
                 default:
@@ -1179 +1251 @@
 static void smbldap_idle_fn(struct event_context *event_ctx,
                             struct timed_event *te,
-                            struct timeval now,
+                            struct timeval now_abs,
                             void *private_data);
 
@@ -1191 +1263 @@
         SMB_ASSERT(ldap_state);
 
-        if ((ldap_state->ldap_struct != NULL) && ((ldap_state->last_ping + SMBLDAP_DONT_PING_TIME) < time(NULL))) {
+        if ((ldap_state->ldap_struct != NULL) && ((ldap_state->last_ping + SMBLDAP_DONT_PING_TIME) < time_mono(NULL))) {
 
 #ifdef HAVE_UNIXSOCKET
@@ -1215 +1287 @@
                         ldap_state->last_ping = (time_t)0;
                 } else {
-                        ldap_state->last_ping = time(NULL);
+                        ldap_state->last_ping = time_mono(NULL);
                 } 
         }
@@ -1233 +1305 @@
 
 
-        ldap_state->last_ping = time(NULL);
+        ldap_state->last_ping = time_mono(NULL);
         ldap_state->pid = sys_getpid();
 
@@ -1285 +1357 @@
                             int *attempts, time_t endtime)
 {
-        time_t now = time(NULL);
+        time_t now = time_mono(NULL);
         int open_rc = LDAP_SERVER_DOWN;
 
@@ -1358 +1430 @@
         int             attempts = 0;
         char           *utf8_filter;
-        time_t          endtime = time(NULL)+lp_ldap_timeout();
+        time_t          endtime = time_mono(NULL)+lp_ldap_timeout();
         struct          timeval timeout;
         size_t          converted_size;
@@ -1369 +1441 @@
         if (ldap_state->last_rebind.tv_sec > 0) {
                 struct timeval  tval;
+                struct timespec ts;
                 int64_t tdiff = 0;
                 int             sleep_time = 0;
 
-                ZERO_STRUCT(tval);
-                GetTimeOfDay(&tval);
+                clock_gettime_mono(&ts);
+                tval = convert_timespec_to_timeval(ts);
 
                 tdiff = usec_time_diff(&tval, &ldap_state->last_rebind);
@@ -1407 +1480 @@
 
         got_alarm = 0;
-        CatchSignal(SIGALRM, SIGNAL_CAST gotalarm_sig);
+        CatchSignal(SIGALRM, gotalarm_sig);
         alarm(lp_ldap_timeout());
         /* End setup timeout. */
@@ -1442 +1515 @@
 
         /* Teardown timeout. */
-        CatchSignal(SIGALRM, SIGNAL_CAST SIG_IGN);
+        CatchSignal(SIGALRM, SIG_IGN);
         alarm(0);
 
@@ -1556 +1629 @@
         int             attempts = 0;
         char           *utf8_dn;
-        time_t          endtime = time(NULL)+lp_ldap_timeout();
+        time_t          endtime = time_mono(NULL)+lp_ldap_timeout();
         size_t          converted_size;
 
@@ -1600 +1673 @@
         int             attempts = 0;
         char           *utf8_dn;
-        time_t          endtime = time(NULL)+lp_ldap_timeout();
+        time_t          endtime = time_mono(NULL)+lp_ldap_timeout();
         size_t          converted_size;
 
@@ -1644 +1717 @@
         int             attempts = 0;
         char           *utf8_dn;
-        time_t          endtime = time(NULL)+lp_ldap_timeout();
+        time_t          endtime = time_mono(NULL)+lp_ldap_timeout();
         size_t          converted_size;
 
@@ -1690 +1763 @@
         int             rc = LDAP_SERVER_DOWN;
         int             attempts = 0;
-        time_t          endtime = time(NULL)+lp_ldap_timeout();
+        time_t          endtime = time_mono(NULL)+lp_ldap_timeout();
 
         if (!ldap_state)
@@ -1737 +1810 @@
 static void smbldap_idle_fn(struct event_context *event_ctx,
                             struct timed_event *te,
-                            struct timeval now,
+                            struct timeval now_abs,
                             void *private_data)
 {
@@ -1749 +1822 @@
         }
 
-        if ((state->last_use+SMBLDAP_IDLE_TIME) > now.tv_sec) {
+        if ((state->last_use+SMBLDAP_IDLE_TIME) > time_mono(NULL)) {
                 DEBUG(10,("ldap connection not idle...\n"));
 
+                /* this needs to be made monotonic clock aware inside tevent: */
                 state->idle_event = event_add_timed(
                         event_ctx, state,
-                        timeval_add(&now, SMBLDAP_IDLE_TIME, 0),
+                        timeval_add(&now_abs, SMBLDAP_IDLE_TIME, 0),
                         smbldap_idle_fn,
                         private_data);