diff options
| author | Gerald Carter <jerry@samba.org> | 2005-12-15 18:39:28 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 11:05:51 -0500 |
| commit | 6f91e3a8629de97468357339f68d789ab01814ce (patch) | |
| tree | 31c6878769c0ebfdc7dcf15efdafddf14c432e7f | |
| parent | 91efc453ab420d51998e159d14264cc24be71558 (diff) | |
| download | samba-6f91e3a8629de97468357339f68d789ab01814ce.tar.gz samba-6f91e3a8629de97468357339f68d789ab01814ce.tar.bz2 samba-6f91e3a8629de97468357339f68d789ab01814ce.zip | |
r12262: * 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()
(This used to be commit 58f8b42069a69c0b61da2609e5706a6c0d512e09)
| -rw-r--r-- | source3/rpc_server/srv_samr_nt.c | 2 | ||||
| -rw-r--r-- | source3/utils/eventlogadm.c | 10 |
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 ) |