svn commit: samba r7880 - in branches/SAMBA_3_0/source: rpc_parse rpc_server

[jerry at samba.org]

Author: jerry
Date: 2005-06-24 15:49:02 +0000 (Fri, 24 Jun 2005)
New Revision: 7880

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=7880

Log:
fix a typo and memleak on failures cases (patch from marcin)
Modified:
   branches/SAMBA_3_0/source/rpc_parse/parse_eventlog.c
   branches/SAMBA_3_0/source/rpc_server/srv_eventlog.c
   branches/SAMBA_3_0/source/rpc_server/srv_eventlog_nt.c


Changeset:
Modified: branches/SAMBA_3_0/source/rpc_parse/parse_eventlog.c
===================================================================
--- branches/SAMBA_3_0/source/rpc_parse/parse_eventlog.c	2005-06-24 15:13:25 UTC (rev 7879)
+++ branches/SAMBA_3_0/source/rpc_parse/parse_eventlog.c	2005-06-24 15:49:02 UTC (rev 7880)
@@ -33,7 +33,7 @@
 	if(q_u == NULL)
 		return False;
     
-    /* Data format seems to be:
+    /** Data format seems to be:
        UNKNOWN structure
          uint32            unknown
          uint16            unknown
@@ -258,7 +258,7 @@
 
 	return True;
 }
-/* Structure of response seems to be:
+/** Structure of response seems to be:
    DWORD num_bytes_in_resp -- MUST be the same as q_u->max_read_size
    for i=0..n
        EVENTLOGRECORD record
@@ -397,7 +397,7 @@
 	return True;
 }
 
-/* The windows client seems to be doing something funny with the file name
+/** The windows client seems to be doing something funny with the file name
    A call like
       ClearEventLog(handle, "backup_file")
    on the client side will result in the backup file name looking like this on the

Modified: branches/SAMBA_3_0/source/rpc_server/srv_eventlog.c
===================================================================
--- branches/SAMBA_3_0/source/rpc_server/srv_eventlog.c	2005-06-24 15:13:25 UTC (rev 7879)
+++ branches/SAMBA_3_0/source/rpc_server/srv_eventlog.c	2005-06-24 15:49:02 UTC (rev 7880)
@@ -185,7 +185,7 @@
 struct api_struct api_eventlog_cmds[] =
 {
 	{"EVENTLOG_OPENEVENTLOG", 	EVENTLOG_OPENEVENTLOG, 		api_eventlog_open_eventlog    },
-	{"EVENTLOG_CLOSEVENTLOG", 	EVENTLOG_CLOSEEVENTLOG, 	api_eventlog_close_eventlog   },
+	{"EVENTLOG_CLOSEEVENTLOG", 	EVENTLOG_CLOSEEVENTLOG, 	api_eventlog_close_eventlog   },
 	{"EVENTLOG_GETNUMRECORDS", 	EVENTLOG_GETNUMRECORDS, 	api_eventlog_get_num_records  },
 	{"EVENTLOG_GETOLDESTENTRY", 	EVENTLOG_GETOLDESTENTRY, 	api_eventlog_get_oldest_entry },
 	{"EVENTLOG_READEVENTLOG", 	EVENTLOG_READEVENTLOG, 		api_eventlog_read_eventlog    },

Modified: branches/SAMBA_3_0/source/rpc_server/srv_eventlog_nt.c
===================================================================
--- branches/SAMBA_3_0/source/rpc_server/srv_eventlog_nt.c	2005-06-24 15:13:25 UTC (rev 7879)
+++ branches/SAMBA_3_0/source/rpc_server/srv_eventlog_nt.c	2005-06-24 15:49:02 UTC (rev 7880)
@@ -169,12 +169,18 @@
     DEBUG(10, ("_eventlog_open_eventlog: Using [%s] as the source log file.\n", info->source_log_file_name));
 
     if(!create_policy_hnd(p, &(r_u->handle), free_eventlog_info, (void *)info))
+    {
+	free_eventlog_info(info);
 	return WERR_NOMEM;
+    }
 
     policy_handle_to_string(&r_u->handle, &info->handle_string);
 
     if(!(_eventlog_open_eventlog_hook(info)))
+    {
+	close_policy_hnd(p, &r_u->handle);
 	return WERR_BADFILE;
+    }
 
     return WERR_OK;
 }