svn commit: samba r9803 - in branches/tmp/vl-cluster/source: nmbd rpc_server utils web

vlendec at samba.org vlendec at samba.org
Tue Aug 30 15:35:03 GMT 2005


Author: vlendec
Date: 2005-08-30 15:35:02 +0000 (Tue, 30 Aug 2005)
New Revision: 9803

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

Log:
Merge trunk up to r9802
Modified:
   branches/tmp/vl-cluster/source/nmbd/nmbd.c
   branches/tmp/vl-cluster/source/rpc_server/srv_reg_nt.c
   branches/tmp/vl-cluster/source/utils/net_rpc.c
   branches/tmp/vl-cluster/source/utils/net_rpc_service.c
   branches/tmp/vl-cluster/source/web/swat.c


Changeset:
Modified: branches/tmp/vl-cluster/source/nmbd/nmbd.c
===================================================================
--- branches/tmp/vl-cluster/source/nmbd/nmbd.c	2005-08-30 15:30:50 UTC (rev 9802)
+++ branches/tmp/vl-cluster/source/nmbd/nmbd.c	2005-08-30 15:35:02 UTC (rev 9803)
@@ -655,7 +655,6 @@
 	pstring logfile;
 	static BOOL opt_interactive;
 	poptContext pc;
-	int opt;
 	struct poptOption long_options[] = {
 	POPT_AUTOHELP
 	{"daemon", 'D', POPT_ARG_VAL, &is_daemon, True, "Become a daemon(default)" },
@@ -671,7 +670,7 @@
 	global_nmb_port = NMB_PORT;
 
 	pc = poptGetContext("nmbd", argc, argv, long_options, 0);
-	while ((opt = poptGetNextOpt(pc)) != -1) ;
+	while (poptGetNextOpt(pc) != -1) {};
 	poptFreeContext(pc);
 
 	global_in_nmbd = True;

Modified: branches/tmp/vl-cluster/source/rpc_server/srv_reg_nt.c
===================================================================
--- branches/tmp/vl-cluster/source/rpc_server/srv_reg_nt.c	2005-08-30 15:30:50 UTC (rev 9802)
+++ branches/tmp/vl-cluster/source/rpc_server/srv_reg_nt.c	2005-08-30 15:35:02 UTC (rev 9803)
@@ -907,7 +907,7 @@
 	
 	for ( i=0; i<key->num_values; i++ ) {
 		regval_ctr_addvalue( values, key->values[i].valuename, key->values[i].type,
-			key->values[i].data, (key->values[i].data_size & ~VK_DATA_IN_OFFSET) );
+			(char*)key->values[i].data, (key->values[i].data_size & ~VK_DATA_IN_OFFSET) );
 	}
 
 	/* copy subkeys into the REGSUBKEY_CTR */
@@ -1316,7 +1316,7 @@
 	
 	fetch_reg_values( key, values );
 	
-	regval_ctr_addvalue( values, valuename, q_u->type, q_u->value.buffer, q_u->value.buf_len );
+	regval_ctr_addvalue( values, valuename, q_u->type, (char*)q_u->value.buffer, q_u->value.buf_len );
 	
 	/* now write to the registry backend */
 	

Modified: branches/tmp/vl-cluster/source/utils/net_rpc.c
===================================================================
--- branches/tmp/vl-cluster/source/utils/net_rpc.c	2005-08-30 15:30:50 UTC (rev 9802)
+++ branches/tmp/vl-cluster/source/utils/net_rpc.c	2005-08-30 15:35:02 UTC (rev 9803)
@@ -5959,6 +5959,7 @@
 	d_printf("  net rpc shutdown \t\tto shutdown a remote server\n");
 	d_printf("  net rpc rights\t\tto manage privileges assigned to SIDs\n");
 	d_printf("  net rpc registry\t\tto manage registry hives\n");
+	d_printf("  net rpc service\t\tto start, stop and query services\n");
 	d_printf("\n");
 	d_printf("'net rpc shutdown' also accepts the following miscellaneous options:\n"); /* misc options */
 	d_printf("\t-r or --reboot\trequest remote server reboot on shutdown\n");

Modified: branches/tmp/vl-cluster/source/utils/net_rpc_service.c
===================================================================
--- branches/tmp/vl-cluster/source/utils/net_rpc_service.c	2005-08-30 15:30:50 UTC (rev 9802)
+++ branches/tmp/vl-cluster/source/utils/net_rpc_service.c	2005-08-30 15:35:02 UTC (rev 9803)
@@ -499,7 +499,7 @@
 	d_printf("net rpc service start <service>    Start a service\n");
 	d_printf("net rpc service stop <service>     Stop a service\n");
 	d_printf("net rpc service pause <service>    Pause a service\n");
-	d_printf("net rpc service resume <service>   Resume a paused a service\n");
+	d_printf("net rpc service resume <service>   Resume a paused service\n");
 	d_printf("net rpc service status <service>   View the current status of a service\n");
 	
 	return -1;

Modified: branches/tmp/vl-cluster/source/web/swat.c
===================================================================
--- branches/tmp/vl-cluster/source/web/swat.c	2005-08-30 15:30:50 UTC (rev 9802)
+++ branches/tmp/vl-cluster/source/web/swat.c	2005-08-30 15:35:02 UTC (rev 9803)
@@ -1386,13 +1386,12 @@
  **/
  int main(int argc, char *argv[])
 {
-	int opt;
 	const char *page;
 	poptContext pc;
 	struct poptOption long_options[] = {
 		POPT_AUTOHELP
 		{ "disable-authentication", 'a', POPT_ARG_VAL, &demo_mode, True, "Disable authentication (demo mode)" },
-        { "password-menu-only", 'P', POPT_ARG_VAL, &passwd_only, True, "Show only change password menu" }, 
+        	{ "password-menu-only", 'P', POPT_ARG_VAL, &passwd_only, True, "Show only change password menu" }, 
 		POPT_COMMON_SAMBA
 		POPT_TABLEEND
 	};
@@ -1423,7 +1422,7 @@
 
 	/* Parse command line options */
 
-	while((opt = poptGetNextOpt(pc)) != -1) { }
+	while(poptGetNextOpt(pc) != -1) { }
 
 	poptFreeContext(pc);
 



More information about the samba-cvs mailing list