Changeset 988 for vendor/current/source3/lib/eventlog

Timestamp:

Nov 24, 2016, 1:14:11 PM (9 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: update vendor to version 4.4.3

File:

• vendor/current/source3/lib/eventlog/eventlog.c (modified) (11 diffs)

vendor/current/source3/lib/eventlog/eventlog.c

@@ -74 +74 @@
         char *tdbname;
 
-        path = talloc_strdup(ctx, state_path("eventlog"));
+        path = state_path("eventlog");
         if (!path) {
                 return NULL;
@@ -85 +85 @@
         }
 
-        tdbname = talloc_asprintf(path, "%s/%s", state_path("eventlog"), file);
+        tdbname = talloc_asprintf(ctx, "%s/%s", path, file);
         if (!tdbname) {
                 talloc_free(path);
@@ -91 +91 @@
         }
 
+        talloc_free(path);
         return tdbname;
 }
@@ -341 +342 @@
         char *eventlogdir;
         TALLOC_CTX *ctx = talloc_tos();
+        bool ok;
 
         /* check for invalid options */
@@ -372 +374 @@
         /* make sure that the eventlog dir exists */
 
-        eventlogdir = state_path( "eventlog" );
-        if ( !directory_exist( eventlogdir ) )
-                mkdir( eventlogdir, 0755 );
+        eventlogdir = state_path("eventlog");
+        if (eventlogdir == NULL) {
+                return NULL;
+        }
+        ok = directory_create_or_exist(eventlogdir, 0755);
+        TALLOC_FREE(eventlogdir);
+        if (!ok) {
+                return NULL;
+        }
 
         /* get the path on disk */
@@ -417 +425 @@
                 }
 
-                if ( !(tdb_node = TALLOC_ZERO_P( NULL, ELOG_TDB)) ) {
+                if ( !(tdb_node = talloc_zero( NULL, ELOG_TDB)) ) {
                         DEBUG(0,("elog_open_tdb: talloc() failure!\n"));
                         tdb_close( tdb );
@@ -579 +587 @@
         } else if ( 0 == strncmp( start, "STR", stop - start ) ) {
                 size_t tmp_len;
-                int num_of_strings;
+                size_t num_of_strings;
                 /* skip past initial ":" */
                 stop++;
@@ -782 +790 @@
         /* lock */
         ret = tdb_lock_bystring_with_timeout(tdb, EVT_NEXT_RECORD, 1);
-        if (ret == -1) {
+        if (ret != 0) {
                 return NT_STATUS_LOCK_NOT_GRANTED;
         }
@@ -805 +813 @@
 
         ret = tdb_store(tdb, kbuf, ebuf, 0);
-        if (ret == -1) {
+        if (ret != 0) {
                 tdb_unlock_bystring(tdb, EVT_NEXT_RECORD);
                 return NT_STATUS_EVENTLOG_FILE_CORRUPT;
@@ -811 +819 @@
 
         ret = tdb_store_int32(tdb, EVT_NEXT_RECORD, r->record_number + 1);
-        if (ret == -1) {
+        if (ret != 0) {
                 tdb_unlock_bystring(tdb, EVT_NEXT_RECORD);
                 return NT_STATUS_EVENTLOG_FILE_CORRUPT;
@@ -955 +963 @@
                 if (!convert_string_talloc(mem_ctx, CH_UTF16, CH_UNIX,
                                            t->sid.data, t->sid.length,
-                                           (void *)&sid_str, &len, false)) {
+                                           (void *)&sid_str, &len)) {
                         return NT_STATUS_INVALID_SID;
                 }