Changeset 228 for branches/samba-3.2.x/source/rpc_server/srv_eventlog_nt.c

Timestamp:

May 26, 2009, 9:44:50 AM (17 years ago)

Author:

Herwig Bauernfeind

Message:

Update 3.2 branch to 3.2.6

File:

• branches/samba-3.2.x/source/rpc_server/srv_eventlog_nt.c (modified) (9 diffs)

branches/samba-3.2.x/source/rpc_server/srv_eventlog_nt.c

@@ -81 +81 @@
         
         sec_desc = get_nt_acl_no_snum( info, tdbname );
-        SAFE_FREE( tdbname );
+        _FREE( tdbname );
         
         if ( !sec_desc ) {
@@ -292 +292 @@
         TDB_DATA ret, key;
 
-        int srecno;
-        int reclen;
+        int srecno;
+        int reclen;
         int len;
 
@@ -302 +302 @@
         char *puserdata = NULL;
 
-        key.dsize = sizeof(int32);
+        key.dsize = sizeof(int32);
 
         srecno = recno;
-        key.dptr = ( uint8 * ) &srecno;
+        key.dptr = (&srecno;
 
         ret = tdb_fetch( tdb, key );
@@ -428 +428 @@
         WERROR wresult;
         char *elogname = info->logname;
-        TALLOC_CTX *ctx = talloc_tos();
+        TALLOC_CTX *ctx = talloc_();
         bool ret = false;
 
@@ -435 +435 @@
         if ( !info->etdb ) {
                 DEBUG( 4, ( "No open tdb! (%s)\n", info->logname ) );
-                return False;
+                e;
         }
         /* set resonable defaults.  512Kb on size and 1 week on time */
@@ -449 +449 @@
         path = talloc_asprintf(ctx, "%s/%s", KEY_EVENTLOG, elogname );
         if (!path) {
-                return false;
+                e;
         }
 
@@ -459 +459 @@
                        ( "sync_eventlog_params: Failed to open key [%s] (%s)\n",
                          path, dos_errstr( wresult ) ) );
-                return false;
+                e;
         }
 
@@ -466 +466 @@
                 DEBUG(4, ("Failed to query value \"Retention\": %s\n",
                           dos_errstr(wresult)));
-                ret = false;
                 goto done;
         }
@@ -475 +474 @@
                 DEBUG(4, ("Failed to query value \"MaxSize\": %s\n",
                           dos_errstr(wresult)));
-                ret = false;
                 goto done;
         }