Author: jsuchome Date: Tue Apr 29 15:27:37 2008 New Revision: 47159 URL: http://svn.opensuse.org/viewcvs/yast?rev=47159&view=rev Log: - save smb.conf when winbind is off (better fix for bnc#383374) - 2.16.8 Modified: trunk/samba-client/VERSION trunk/samba-client/package/yast2-samba-client.changes trunk/samba-client/src/SambaAD.pm Modified: trunk/samba-client/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/samba-client/VERSION?rev=47159&r1=47158&r2=47159&view=diff ============================================================================== --- trunk/samba-client/VERSION (original) +++ trunk/samba-client/VERSION Tue Apr 29 15:27:37 2008 @@ -1 +1 @@ -2.16.7 +2.16.8 Modified: trunk/samba-client/package/yast2-samba-client.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/samba-client/package/yast2-samba-client.changes?rev=47159&r1=47158&r2=47159&view=diff ============================================================================== --- trunk/samba-client/package/yast2-samba-client.changes (original) +++ trunk/samba-client/package/yast2-samba-client.changes Tue Apr 29 15:27:37 2008 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue Apr 29 15:00:11 CEST 2008 - jsuchome@suse.cz + +- save smb.conf when winbind is off (better fix for bnc#383374) +- 2.16.8 + +------------------------------------------------------------------- Fri Apr 25 11:47:52 CEST 2008 - jsuchome@suse.cz - correctly create machine account: transform DN, use correct Modified: trunk/samba-client/src/SambaAD.pm URL: http://svn.opensuse.org/viewcvs/yast/trunk/samba-client/src/SambaAD.pm?rev=47159&r1=47158&r2=47159&view=diff ============================================================================== --- trunk/samba-client/src/SambaAD.pm (original) +++ trunk/samba-client/src/SambaAD.pm Tue Apr 29 15:27:37 2008 @@ -325,17 +325,17 @@ my $workgroup = SambaConfig->GlobalGetStr ("workgroup", ""); # remove special AD values if AD is not used my $remove = (($ads || "") eq ""); + SambaConfig->GlobalSetMap({ + "security" => $remove ? "domain" : "ADS", + "realm" => $remove ? undef : $realm, + "template homedir" => $remove ? undef : "/home/%D/%U", + "winbind refresh tickets" => $remove ? undef : "yes" + }); + SambaConfig->WinbindGlobalSetMap({ + "krb5_auth" => $remove ? undef : "yes", + "krb5_ccache_type" => $remove ? undef : "FILE" + }); if ($status) { - SambaConfig->GlobalSetMap({ - "security" => $remove ? "domain" : "ADS", - "realm" => $remove ? undef : $realm, - "template homedir" => $remove ? undef : "/home/%D/%U", - "winbind refresh tickets" => $remove ? undef : "yes" - }); - SambaConfig->WinbindGlobalSetMap({ - "krb5_auth" => $remove ? undef : "yes", - "krb5_ccache_type" => $remove ? undef : "FILE" - }); if (SambaConfig->GlobalGetTruth ("domain logons", 0)) { SambaConfig->GlobalSetTruth ("domain logons", 0) } @@ -343,14 +343,6 @@ SambaConfig->GlobalSetStr ("domain master", "Auto") } } - else { - SambaConfig->GlobalSetMap({ - "security" => $remove ? "domain" : "ADS", - "realm" => $remove ? undef : $realm, - "template homedir" => $remove ? undef : "/home/%D/%U", - "winbind refresh tickets" => $remove ? undef : "yes" - }); - } } # Change Kerberos configuration (for AD). Uses current (previously read) -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org