svn commit: samba r12262 - branches/SAMBA_3_0/source/rpc_server branches/SAMBA_3_0/source/utils trunk/source/rpc_server trunk/source/utils

[jerry at samba.org]

Author: jerry
Date: 2005-12-15 18:39:28 +0000 (Thu, 15 Dec 2005)
New Revision: 12262

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

Log:
* patch from Brian Moran to fix segv in eventlogadm when not eventlogs
  are listed in smb.conf
* initialize the local group description in set_alias_info()


Modified:
   branches/SAMBA_3_0/source/rpc_server/srv_samr_nt.c
   branches/SAMBA_3_0/source/utils/eventlogadm.c
   trunk/source/rpc_server/srv_samr_nt.c
   trunk/source/utils/eventlogadm.c


Changeset:
Modified: branches/SAMBA_3_0/source/rpc_server/srv_samr_nt.c
===================================================================
--- branches/SAMBA_3_0/source/rpc_server/srv_samr_nt.c	2005-12-15 18:28:36 UTC (rev 12261)
+++ branches/SAMBA_3_0/source/rpc_server/srv_samr_nt.c	2005-12-15 18:39:28 UTC (rev 12262)
@@ -4516,6 +4516,8 @@
 					ctr->alias.info3.description.string, 
 					sizeof(info.acct_desc)-1 );
 			}
+			else
+				fstrcpy( info.acct_desc, "" );
 			break;
 		default:
 			return NT_STATUS_INVALID_INFO_CLASS;

Modified: branches/SAMBA_3_0/source/utils/eventlogadm.c
===================================================================
--- branches/SAMBA_3_0/source/utils/eventlogadm.c	2005-12-15 18:28:36 UTC (rev 12261)
+++ branches/SAMBA_3_0/source/utils/eventlogadm.c	2005-12-15 18:39:28 UTC (rev 12262)
@@ -51,9 +51,13 @@
 	elogs = lp_eventlog_list(  );
 	printf( "Active eventlog names (from smb.conf):\n" );
 	printf( "--------------------------------------\n" );
-	for ( i = 0; elogs[i]; i++ ) {
-		printf( "\t%s\n", elogs[i] );
-	}
+	if ( elogs ) {
+		for ( i = 0; elogs[i]; i++ ) {
+			printf( "\t%s\n", elogs[i] );
+		}
+	} 
+	else
+		printf( "\t<None specified>\n");
 }
 
 int DoAddSourceCommand( int argc, char **argv, BOOL debugflag, char *exename )

Modified: trunk/source/rpc_server/srv_samr_nt.c
===================================================================
--- trunk/source/rpc_server/srv_samr_nt.c	2005-12-15 18:28:36 UTC (rev 12261)
+++ trunk/source/rpc_server/srv_samr_nt.c	2005-12-15 18:39:28 UTC (rev 12262)
@@ -4516,6 +4516,8 @@
 					ctr->alias.info3.description.string, 
 					sizeof(info.acct_desc)-1 );
 			}
+			else
+				fstrcpy( info.acct_desc, "" );
 			break;
 		default:
 			return NT_STATUS_INVALID_INFO_CLASS;

Modified: trunk/source/utils/eventlogadm.c
===================================================================
--- trunk/source/utils/eventlogadm.c	2005-12-15 18:28:36 UTC (rev 12261)
+++ trunk/source/utils/eventlogadm.c	2005-12-15 18:39:28 UTC (rev 12262)
@@ -51,9 +51,13 @@
 	elogs = lp_eventlog_list(  );
 	printf( "Active eventlog names (from smb.conf):\n" );
 	printf( "--------------------------------------\n" );
-	for ( i = 0; elogs[i]; i++ ) {
-		printf( "\t%s\n", elogs[i] );
-	}
+	if ( elogs ) {
+		for ( i = 0; elogs[i]; i++ ) {
+			printf( "\t%s\n", elogs[i] );
+		}
+	} 
+	else
+		printf( "\t<None specified>\n");
 }
 
 int DoAddSourceCommand( int argc, char **argv, BOOL debugflag, char *exename )