summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--source3/rpc_server/srv_samr_nt.c2
-rw-r--r--source3/utils/eventlogadm.c10
2 files changed, 9 insertions, 3 deletions
diff --git a/source3/rpc_server/srv_samr_nt.c b/source3/rpc_server/srv_samr_nt.c
index 880e1db388..c90b4d3660 100644
--- a/source3/rpc_server/srv_samr_nt.c
+++ b/source3/rpc_server/srv_samr_nt.c
@@ -4516,6 +4516,8 @@ NTSTATUS _samr_set_aliasinfo(pipes_struct *p, SAMR_Q_SET_ALIASINFO *q_u, SAMR_R_
ctr->alias.info3.description.string,
sizeof(info.acct_desc)-1 );
}
+ else
+ fstrcpy( info.acct_desc, "" );
break;
default:
return NT_STATUS_INVALID_INFO_CLASS;
diff --git a/source3/utils/eventlogadm.c b/source3/utils/eventlogadm.c
index 1d60d6b7ea..a0fc4bcf9d 100644
--- a/source3/utils/eventlogadm.c
+++ b/source3/utils/eventlogadm.c
@@ -51,9 +51,13 @@ static void display_eventlog_names( void )
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 )