Changeset 149 for trunk/samba/source/lib

Timestamp:

Aug 20, 2008, 9:10:33 AM (17 years ago)

Author:

Paul Smedley

Message:

Update trunk to v3.2.2

Location:

trunk/samba/source/lib

Files:

• charcnv.c (modified) (3 diffs)
• dbwrap_ctdb.c (modified) (1 diff)
• dbwrap_util.c (modified) (4 diffs)
• debug.c (modified) (4 diffs)
• errmap_unix.c (modified) (1 diff)
• netapi/netapi.h (modified) (2 diffs)
• replace/libreplace_cc.m4 (modified) (1 diff)
• replace/replace.c (modified) (1 diff)
• tdb/common/tdb.c (modified) (1 diff)
• util.c (modified) (2 diffs)
• util_sid.c (modified) (2 diffs)
• util_unistr.c (modified) (3 diffs)

trunk/samba/source/lib/charcnv.c

@@ -48 +48 @@
 static smb_iconv_t conv_handles[NUM_CHARSETS][NUM_CHARSETS];
 static bool conv_silent; /* Should we do a debug if the conversion fails ? */
+static bool initialized;
 
 /**
@@ -93 +94 @@
 void lazy_initialize_conv(void)
 {
-        static int initialized = False;
-
         if (!initialized) {
-                initialized = True;
                 load_case_tables();
                 init_iconv();
+                initialized = true;
         }
 }
@@ -117 +116 @@
                 }
         }
+        initialized = false;
 }
 

trunk/samba/source/lib/dbwrap_ctdb.c

@@ -489 +489 @@
         tdb_flags &= TDB_SEQNUM;
 
+        /* honor permissions if user has specified O_CREAT */
+        if (open_flags & O_CREAT) {
+                chmod(db_path, mode);
+        }
+
         db_ctdb->wtdb = tdb_wrap_open(db_ctdb, db_path, hash_size, tdb_flags, O_RDWR, 0);
         if (db_ctdb->wtdb == NULL) {

trunk/samba/source/lib/dbwrap_util.c

@@ -99 +99 @@
 }
 
+/**
+ * Atomic unsigned integer change (addition):
+ *
+ * if value does not exist yet in the db, use *oldval as initial old value.
+ * return old value in *oldval.
+ * store *oldval + change_val to db.
+ */
 uint32_t dbwrap_change_uint32_atomic(struct db_context *db, const char *keystr,
                                      uint32_t *oldval, uint32_t change_val)
@@ -111 +118 @@
         }
 
-        if ((rec->value.dptr != NULL)
-            && (rec->value.dsize == sizeof(val))) {
+        if (rec->value.dptr == NULL) {
+                val = *oldval;
+        } else if (rec->value.dsize == sizeof(val)) {
                 val = IVAL(rec->value.dptr, 0);
+                *oldval = val;
+        } else {
+                return -1;
         }
 
@@ -128 +139 @@
 }
 
+/**
+ * Atomic integer change (addition):
+ *
+ * if value does not exist yet in the db, use *oldval as initial old value.
+ * return old value in *oldval.
+ * store *oldval + change_val to db.
+ */
 int32 dbwrap_change_int32_atomic(struct db_context *db, const char *keystr,
                                  int32 *oldval, int32 change_val)
@@ -140 +158 @@
         }
 
-        if ((rec->value.dptr != NULL)
-            && (rec->value.dsize == sizeof(val))) {
+        if (rec->value.dptr == NULL) {
+                val = *oldval;
+        } else if (rec->value.dsize == sizeof(val)) {
                 val = IVAL(rec->value.dptr, 0);
+                *oldval = val;
+        } else {
+                return -1;
         }
 

trunk/samba/source/lib/debug.c

@@ -95 +95 @@
 /*
  * This is to allow assignment to DEBUGLEVEL before the debug
- * system has been initialised.
+ * system has been initialized.
  */
 static int debug_all_class_hack = 1;
@@ -184 +184 @@
 ****************************************************************************/
 
+static bool initialized;
+
 void gfree_debugsyms(void)
 {
@@ -195 +197 @@
         }
 
-        if ( DEBUGLEVEL_CLASS != &debug_all_class_hack )
+        if ( DEBUGLEVEL_CLASS != &debug_all_class_hack ) {
                 SAFE_FREE( DEBUGLEVEL_CLASS );
-
-        if ( DEBUGLEVEL_CLASS_ISSET != &debug_all_class_isset_hack )
+                DEBUGLEVEL_CLASS = &debug_all_class_hack;
+        }
+
+        if ( DEBUGLEVEL_CLASS_ISSET != &debug_all_class_isset_hack ) {
                 SAFE_FREE( DEBUGLEVEL_CLASS_ISSET );
+                DEBUGLEVEL_CLASS_ISSET = &debug_all_class_isset_hack;
+        }
 
         SAFE_FREE(format_bufr);
+
+        debug_num_classes = 0;
+
+        debug_level = DEBUGLEVEL_CLASS;
+
+        initialized = false;
 }
 
@@ -531 +543 @@
 void debug_init(void)
 {
-        static bool initialised = False;
         const char **p;
 
-        if (initialised)
+        if (initialized)
                 return;
 
-        initialised = True;
+        initialized = true;
 
         for(p = default_classname_table; *p; p++) {

trunk/samba/source/lib/errmap_unix.c

@@ -108 +108 @@
         int i = 0;
 
-        if (unix_error == 0)
-                return NT_STATUS_OK;
+        if (unix_error == 0) {
+                /* we map this to an error, not success, as this
+                   function is only called in an error path. Lots of
+                   our virtualised functions may fail without making a
+                   unix system call that fails (such as when they are
+                   checking for some handle existing), so unix_error
+                   may be unset
+                */
+                return NT_STATUS_UNSUCCESSFUL;
+        }
 
         /* Look through list */

trunk/samba/source/lib/netapi/netapi.h

@@ -20 +20 @@
 #ifndef __LIB_NETAPI_H__
 #define __LIB_NETAPI_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
 
 /****************************************************************
@@ -460 +464 @@
                                           void **buffer /* [out] [noprint,ref] */);
 
-#endif
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
+#endif /* __LIB_NETAPI_H__ */

trunk/samba/source/lib/replace/libreplace_cc.m4

@@ -168 +168 @@
                 } f2[] = {
                         {FOO_ONE}
-                };   
+                };
+                static const FOOBAR f3[] = {FOO_ONE};
         ],
         libreplace_cv_immediate_structures=yes,

trunk/samba/source/lib/replace/replace.c

@@ -171 +171 @@
 
         gid_t *grouplst = NULL;
-        int max_gr = 32;
+        int max_gr = NGROUPS_MAX;
         int ret;
         int    i,j;

trunk/samba/source/lib/tdb/common/tdb.c

@@ -244 +244 @@
         if (tdb->read_only || tdb->traverse_read) return -1;
 
-        if (tdb->traverse_write != 0 || 
+        if (((tdb->traverse_write != 0) && (!TDB_DEAD(rec))) ||
             tdb_write_lock_record(tdb, rec_ptr) == -1) {
                 /* Someone traversing here: mark it as dead */

trunk/samba/source/lib/util.c

@@ -192 +192 @@
         gfree_loadparm();
         gfree_case_tables();
-        gfree_debugsyms();
         gfree_charcnv();
         gfree_interfaces();
-
-        /* release the talloc null_context memory last */
-        talloc_disable_null_tracking();
+        gfree_debugsyms();
 }
 
@@ -596 +593 @@
 
         ret = S_ISDIR(st->st_mode);
-        if(!ret)
-                errno = ENOTDIR;
+        if(!ret){
+                DEBUG( 0, ( "PS - ENOTDIR1\n" ) );
+                errno = ENOTDIR;}
         return ret;
 }

trunk/samba/source/lib/util_sid.c

@@ -679 +679 @@
 
         if (include_user_group_rid) {
-
-                if (!sid_compose(&sid, info3->base.domain_sid, info3->base.rid))
-                {
+                if (!sid_compose(&sid, info3->base.domain_sid, info3->base.rid)) {
                         DEBUG(3, ("could not compose user SID from rid 0x%x\n",
                                   info3->base.rid));
@@ -692 +690 @@
                         return status;
                 }
-
-                if (!sid_compose(&sid, info3->base.domain_sid, info3->base.primary_gid))
-                {
-                        DEBUG(3, ("could not compose group SID from rid 0x%x\n",
-                                  info3->base.primary_gid));
-                        return NT_STATUS_INVALID_PARAMETER;
+        }
+
+        if (!sid_compose(&sid, info3->base.domain_sid, info3->base.primary_gid)) {
+                DEBUG(3, ("could not compose group SID from rid 0x%x\n",
+                          info3->base.primary_gid));
+                return NT_STATUS_INVALID_PARAMETER;
+        }
+        status = add_sid_to_array(mem_ctx, &sid, &sid_array, &num_sids);
+        if (!NT_STATUS_IS_OK(status)) {
+                DEBUG(3, ("could not append group SID from rid 0x%x\n",
+                          info3->base.rid));
+                return status;
+        }
+
+        for (i = 0; i < info3->base.groups.count; i++) {
+                /* Don't add the primary group sid twice. */
+                if (info3->base.primary_gid == info3->base.groups.rids[i].rid) {
+                        continue;
                 }
-                status = add_sid_to_array(mem_ctx, &sid, &sid_array, &num_sids);
-                if (!NT_STATUS_IS_OK(status)) {
-                        DEBUG(3, ("could not append group SID from rid 0x%x\n",
-                                  info3->base.rid));
-                        return status;
-                }
-        }
-
-        for (i = 0; i < info3->base.groups.count; i++) {
                 if (!sid_compose(&sid, info3->base.domain_sid,
-                                 info3->base.groups.rids[i].rid))
-                {
+                                 info3->base.groups.rids[i].rid)) {
                         DEBUG(3, ("could not compose SID from additional group "
                                   "rid 0x%x\n", info3->base.groups.rids[i].rid));

trunk/samba/source/lib/util_unistr.c

@@ -34 +34 @@
 static bool lowcase_table_use_unmap;
 static bool valid_table_use_unmap;
+static bool initialized;
 
 /**
@@ -60 +61 @@
                         SAFE_FREE(valid_table);
         }
+        initialized = false;
 }
 
@@ -71 +73 @@
 void load_case_tables(void)
 {
-        static int initialised;
         char *old_locale = NULL, *saved_locale = NULL;
         int i;
         TALLOC_CTX *frame = NULL;
 
-        if (initialised) {
+        if (initialized) {
                 return;
         }
-        initialised = 1;
+        initialized = true;
 
         frame = talloc_stackframe();