This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree".

The branch, next has been updated via 725254ef1f42bf0b008af12fb57c66164da8329a (commit) from 30cb47ded4c077ee64f30223022ab374ff838174 (commit)

Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below.

- Log ----------------------------------------------------------------- commit 725254ef1f42bf0b008af12fb57c66164da8329a Author: Arne Fitzenreiter arne_f@ipfire.org Date: Fri Mar 1 19:35:18 2013 +0100

samba: remove MAPTOGUEST="Never".

This option is not supported by samba 3.6.x anymore.

-----------------------------------------------------------------------

Summary of changes: html/cgi-bin/samba.cgi | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-)

Difference in files: diff --git a/html/cgi-bin/samba.cgi b/html/cgi-bin/samba.cgi index 27856ca..b3da32c 100644 --- a/html/cgi-bin/samba.cgi +++ b/html/cgi-bin/samba.cgi @@ -2,7 +2,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2005-2012 IPFire Team info@ipfire.org # +# Copyright (C) 2005-2013 IPFire Team info@ipfire.org # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -92,7 +92,7 @@ $sambasettings{'REMOTESYNC'} = ''; $sambasettings{'PASSWORDSYNC'} = 'off'; $sambasettings{'OTHERINTERFACES'} = '127.0.0.1'; $sambasettings{'GUESTACCOUNT'} = 'samba'; -$sambasettings{'MAPTOGUEST'} = 'Never'; +$sambasettings{'MAPTOGUEST'} = 'Bad User'; $sambasettings{'LOGLEVEL'} = '3 passdb:5 auth:5 winbind:2'; $sambasettings{'SYSLOGLEVEL'} = '1'; $sambasettings{'SYSLOGONLY'} = 'on'; @@ -164,7 +164,7 @@ if ($sambasettings{'ACTION'} eq 'globalresetyes') $sambasettings{'PASSWORDSYNC'} = 'off'; $sambasettings{'OTHERINTERFACES'} = '127.0.0.1'; $sambasettings{'GUESTACCOUNT'} = 'samba'; - $sambasettings{'MAPTOGUEST'} = 'Never'; + $sambasettings{'MAPTOGUEST'} = 'Bad User'; $sambasettings{'LOGLEVEL'} = '3 passdb:5 auth:5 winbind:2'; $sambasettings{'SYSLOGLEVEL'} = '1'; $sambasettings{'SYSLOGONLY'} = 'on'; @@ -427,6 +427,9 @@ $checked{'VPN'}{'off'} = ''; $checked{'VPN'}{'on'} = ''; $checked{'VPN'}{$sambasettings{'VPN'}} = "checked='checked'";

+if ( $sambasettings{'MAPTOGUEST'} eq "Never" ) { + $sambasettings{'MAPTOGUEST'}="Bad User"; +} $selected{'MAPTOGUEST'}{$sambasettings{'MAPTOGUEST'}} = "selected='selected'"; $selected{'SECURITY'}{$sambasettings{'SECURITY'}} = "selected='selected'";

@@ -530,7 +533,6 @@ print <<END <option value='server' $selected{'SECURITY'}{'server'}>Server</option> </select></td></tr> <tr><td align='left' width='40%'>$Lang::tr{'map to guest'}</td><td align='left'><select name='MAPTOGUEST' style="width: 165px"> - <option value='Never' $selected{'MAPTOGUEST'}{'Never'}>Never</option> <option value='Bad User' $selected{'MAPTOGUEST'}{'Bad User'}>Bad User</option> <option value='Bad Password' $selected{'MAPTOGUEST'}{'Bad Password'}>Bad Password</option> </select></td></tr>

hooks/post-receive -- IPFire 2.x development tree