Hello community,
here is the log from the commit of package yast2-samba-server
checked in at Wed Aug 6 02:01:06 CEST 2008.
--------
--- yast2-samba-server/yast2-samba-server.changes 2008-05-16 21:59:22.000000000 +0200
+++ /mounts/work_src_done/STABLE/yast2-samba-server/yast2-samba-server.changes 2008-08-05 10:39:00.000000000 +0200
@@ -1,0 +2,7 @@
+Tue Aug 5 10:36:39 CEST 2008 - locilka@suse.cz
+
+- Adjusted to the newest LDAP SCR agent (patch written by jsuchome)
+ (FATE #303596).
+- 2.17.0
+
+-------------------------------------------------------------------
Old:
----
yast2-samba-server-2.16.3.tar.bz2
New:
----
yast2-samba-server-2.17.0.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-samba-server.spec ++++++
--- /var/tmp/diff_new_pack.X27712/_old 2008-08-06 02:01:00.000000000 +0200
+++ /var/tmp/diff_new_pack.X27712/_new 2008-08-06 02:01:00.000000000 +0200
@@ -1,10 +1,17 @@
#
-# spec file for package yast2-samba-server (Version 2.16.3)
+# spec file for package yast2-samba-server (Version 2.17.0)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
-# This file and all modifications and additions to the pristine
-# package are under the same license as the package itself.
#
+# All modifications and additions to the file contributed by third parties
+# remain the property of their copyright owners, unless otherwise agreed
+# upon. The license for this file, and modifications and additions to the
+# file, is the same license as for the pristine package itself (unless the
+# license for the pristine package is not an Open Source License, in which
+# case the license is the MIT License). An "Open Source License" is a
+# license that conforms to the Open Source Definition (Version 1.9)
+# published by the Open Source Initiative.
+
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
@@ -12,12 +19,12 @@
Name: yast2-samba-server
-Version: 2.16.3
-Release: 7
+Version: 2.17.0
+Release: 1
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-samba-server-2.16.3.tar.bz2
+Source0: yast2-samba-server-2.17.0.tar.bz2
Prefix: /usr
BuildRequires: libsmbclient libsmbclient-devel perl-Crypt-SmbHash perl-X500-DN perl-XML-Writer samba-client update-desktop-files yast2 yast2-devtools yast2-ldap-client yast2-perl-bindings yast2-samba-client yast2-testsuite yast2-users
Requires: perl-Crypt-SmbHash
@@ -45,7 +52,7 @@
Lukas Ocilka
%prep
-%setup -n yast2-samba-server-2.16.3
+%setup -n yast2-samba-server-2.17.0
%build
%{prefix}/bin/y2tool y2autoconf
@@ -79,6 +86,10 @@
/usr/share/YaST2/schema/autoyast/rnc/samba-server.rnc
%doc %{prefix}/share/doc/packages/yast2-samba-server
%changelog
+* Tue Aug 05 2008 locilka@suse.cz
+- Adjusted to the newest LDAP SCR agent (patch written by jsuchome)
+ (FATE #303596).
+- 2.17.0
* Fri May 16 2008 jsrain@suse.cz
- added categories Settings and System into desktop file
(bnc #382778)
++++++ yast2-samba-server-2.16.3.tar.bz2 -> yast2-samba-server-2.17.0.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-samba-server-2.16.3/configure new/yast2-samba-server-2.17.0/configure
--- old/yast2-samba-server-2.16.3/configure 2008-05-16 22:31:26.000000000 +0200
+++ new/yast2-samba-server-2.17.0/configure 2008-08-05 10:39:34.000000000 +0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for yast2-samba-server 2.16.3.
+# Generated by GNU Autoconf 2.61 for yast2-samba-server 2.17.0.
#
# Report bugs to http://bugs.opensuse.org/.
#
@@ -574,8 +574,8 @@
# Identity of this package.
PACKAGE_NAME='yast2-samba-server'
PACKAGE_TARNAME='yast2-samba-server'
-PACKAGE_VERSION='2.16.3'
-PACKAGE_STRING='yast2-samba-server 2.16.3'
+PACKAGE_VERSION='2.17.0'
+PACKAGE_STRING='yast2-samba-server 2.17.0'
PACKAGE_BUGREPORT='http://bugs.opensuse.org/'
ac_unique_file="RPMNAME"
@@ -1197,7 +1197,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures yast2-samba-server 2.16.3 to adapt to many kinds of systems.
+\`configure' configures yast2-samba-server 2.17.0 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1268,7 +1268,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of yast2-samba-server 2.16.3:";;
+ short | recursive ) echo "Configuration of yast2-samba-server 2.17.0:";;
esac
cat <<\_ACEOF
@@ -1346,7 +1346,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-yast2-samba-server configure 2.16.3
+yast2-samba-server configure 2.17.0
generated by GNU Autoconf 2.61
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1360,7 +1360,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by yast2-samba-server $as_me 2.16.3, which was
+It was created by yast2-samba-server $as_me 2.17.0, which was
generated by GNU Autoconf 2.61. Invocation command line was
$ $0 $@
@@ -2181,7 +2181,7 @@
# Define the identity of the package.
PACKAGE='yast2-samba-server'
- VERSION='2.16.3'
+ VERSION='2.17.0'
cat >>confdefs.h <<_ACEOF
@@ -2409,7 +2409,7 @@
-VERSION="2.16.3"
+VERSION="2.17.0"
RPMNAME="yast2-samba-server"
MAINTAINER="Lukas Ocilka "
@@ -3304,7 +3304,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by yast2-samba-server $as_me 2.16.3, which was
+This file was extended by yast2-samba-server $as_me 2.17.0, which was
generated by GNU Autoconf 2.61. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -3347,7 +3347,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-yast2-samba-server config.status 2.16.3
+yast2-samba-server config.status 2.17.0
configured by $0, generated by GNU Autoconf 2.61,
with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-samba-server-2.16.3/configure.in new/yast2-samba-server-2.17.0/configure.in
--- old/yast2-samba-server-2.16.3/configure.in 2008-05-16 22:31:22.000000000 +0200
+++ new/yast2-samba-server-2.17.0/configure.in 2008-08-05 10:39:30.000000000 +0200
@@ -1,9 +1,9 @@
dnl configure.in for yast2-samba-server
dnl
-dnl -- This file is generated by y2autoconf 2.16.7 - DO NOT EDIT! --
+dnl -- This file is generated by y2autoconf 2.17.6 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-samba-server, 2.16.3, http://bugs.opensuse.org/, yast2-samba-server)
+AC_INIT(yast2-samba-server, 2.17.0, http://bugs.opensuse.org/, yast2-samba-server)
dnl Check for presence of file 'RPMNAME'
AC_CONFIG_SRCDIR([RPMNAME])
@@ -18,7 +18,7 @@
AM_INIT_AUTOMAKE(tar-ustar -Wno-portability)
dnl Important YaST2 variables
-VERSION="2.16.3"
+VERSION="2.17.0"
RPMNAME="yast2-samba-server"
MAINTAINER="Lukas Ocilka "
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-samba-server-2.16.3/src/SambaBackendLDAP.pm new/yast2-samba-server-2.17.0/src/SambaBackendLDAP.pm
--- old/yast2-samba-server-2.16.3/src/SambaBackendLDAP.pm 2007-04-13 08:51:30.000000000 +0200
+++ new/yast2-samba-server-2.17.0/src/SambaBackendLDAP.pm 2008-08-05 10:39:17.000000000 +0200
@@ -3,7 +3,7 @@
# Authors: Stanislav Visnovsky
# Martin Lazar
#
-# $Id: SambaBackendLDAP.pm 37433 2007-04-13 06:51:30Z locilka $
+# $Id: SambaBackendLDAP.pm 49671 2008-08-05 08:39:17Z locilka $
#
# Representation of the configuration of samba-server.
# Input and output routines.
@@ -280,14 +280,14 @@
my $templates = Ldap->GetTemplates();
while(my ($dn, $content) = each %$templates) {
- my %objectclass = map {lc $_, 1} @{$content->{objectclass}};
- my %suseplugin = map {$_, 1} @{$content->{suseplugin}};
- if ($objectclass{suseusertemplate} and not $suseplugin{UsersPluginSamba}) {
- push @{$content->{suseplugin}}, "UsersPluginSamba";
+ my %objectClass = map {$_, 1} @{$content->{objectClass}};
+ my %susePlugin = map {$_, 1} @{$content->{susePlugin}};
+ if ($objectClass{suseUserTemplate} and not $susePlugin{UsersPluginSamba}) {
+ push @{$content->{susePlugin}}, "UsersPluginSamba";
$modified = $content->{modified} = "edited";
}
- if ($objectclass{susegrouptemplate} and not $suseplugin{UsersPluginSambaGroup}) {
- push @{$content->{suseplugin}}, "UsersPluginSambaGroup";
+ if ($objectClass{suseGroupTemplate} and not $susePlugin{UsersPluginSambaGroup}) {
+ push @{$content->{susePlugin}}, "UsersPluginSambaGroup";
$modified = $content->{modified} = "edited";
}
}
@@ -326,8 +326,8 @@
y2milestone("Creating dn: $dn");
my $map;
given($attr) {
- when ("dc") {$map = {objectclass => ["top", "dcobject"], dc => $value}}
- when ("ou") {$map = {objectclass => ["top", "organizationalunit"], ou => $value}}
+ when ("dc") {$map = {objectClass => ["top", "dcobject"], dc => $value}}
+ when ("ou") {$map = {objectClass => ["top", "organizationalunit"], ou => $value}}
# translators: error message, followed by class giving error
default {return __("Unknown Class:")." $dn\n".__("Only dcObject (dc) and organizationalUnit (ou) classes are supported.")}
};
@@ -476,9 +476,9 @@
Ldap->ReadConfigModules();
my $conf = Ldap->GetConfigModules();
while(my ($dn, $c) = each %$conf) {
- my %classes = map {lc $_, 1} @{$c->{objectclass}};
- @user = split ",", $c->{susedefaultbase}[0] if $classes{"suseuserconfiguration"};
- @group = split ",", $c->{susedefaultbase}[0] if $classes{"susegroupconfiguration"};
+ my %classes = map {$_, 1} @{$c->{objectClass}};
+ @user = split ",", $c->{suseDefaultBase}[0] if $classes{"suseUserConfiguration"};
+ @group = split ",", $c->{suseDefaultBase}[0] if $classes{"suseGroupConfiguration"};
}
y2milestone("SuseDefaultBase: user=".join(",",@user)." group=",join(",",@group));
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-samba-server-2.16.3/users-plugin/UsersPluginSambaGroups.pm new/yast2-samba-server-2.17.0/users-plugin/UsersPluginSambaGroups.pm
--- old/yast2-samba-server-2.16.3/users-plugin/UsersPluginSambaGroups.pm 2007-03-07 11:21:28.000000000 +0100
+++ new/yast2-samba-server-2.17.0/users-plugin/UsersPluginSambaGroups.pm 2008-08-05 10:36:15.000000000 +0200
@@ -132,7 +132,7 @@
my $config = shift;
my $data = shift;
- if ( grep /^sambagroupmapping$/i, @{$data->{'objectclass'}} ) {
+ if ( grep /^sambagroupmapping$/i, @{$data->{'objectClass'}} ) {
y2milestone( "SambaPlugin: Plugin Present");
return 1;
} else {
@@ -285,10 +285,10 @@
my $oc = "sambaGroupMapping";
# define the object class for new user/groupa
- if (defined $data->{"objectclass"} && ref $data->{"objectclass"} eq "ARRAY")
+ if (defined $data->{"objectClass"} && ref $data->{"objectClass"} eq "ARRAY")
{
- if ( ! grep /^$oc$/i, @{$data->{'objectclass'}} ) {
- push @{$data->{'objectclass'}}, $oc;
+ if ( ! grep /^$oc$/i, @{$data->{'objectClass'}} ) {
+ push @{$data->{'objectClass'}}, $oc;
#y2milestone("added ObjectClass $oc");
}
}
@@ -309,22 +309,22 @@
if (defined $data->{'sambainternal'}->{'sambalocalsid'});
my $gidNumber = 0;
- $gidNumber = $data->{'gidnumber'}
- if (defined $data->{'gidnumber'});
+ $gidNumber = $data->{'gidNumber'}
+ if (defined $data->{'gidNumber'});
my $ridbase = 0;
$ridbase = $data->{'sambainternal'}->{'ridbase'}
if (defined $data->{'sambainternal'}->{'ridbase'});
if ( $gidNumber ) {
- if ( (! $data->{'sambasid'}) || ($data->{'sambasid'} eq "") ) {
- $data->{'sambasid'} = $SID."-". (2 * $gidNumber + $ridbase + 1);
+ if ( (! $data->{'sambaSID'}) || ($data->{'sambaSID'} eq "") ) {
+ $data->{'sambaSID'} = $SID."-". (2 * $gidNumber + $ridbase + 1);
}
}
- if( ! $data->{'displayname'} ) {
- $data->{'displayname'} = (defined $data->{'cn'} ? $data->{'cn'}:"");
+ if( ! $data->{'displayName'} ) {
+ $data->{'displayName'} = (defined $data->{'cn'} ? $data->{'cn'}:"");
}
- $data->{'sambagrouptype'} = "2";
+ $data->{'sambaGroupType'} = "2";
return undef;
}
@@ -337,7 +337,7 @@
my $res = SCR->Read(".ldap.search", { base_dn => $base_dn,
scope => YaST::YCP::Integer(2),
filter => "(objectClass=sambaDomain)",
- attrs => ['sambasid', 'sambaalgorithmicridbase']
+ attrs => ['sambaSID', 'sambaAlgorithmicRidBase']
}
);
if ( ! $res ){
@@ -347,9 +347,9 @@
y2internal("$ldaperr->{'msg'}");
} else {
#y2milestone( Data::Dumper->Dump( [$res] ));
- if ( $res->[0]->{'sambasid'}->[0] ) {
- $data->{'sambainternal'}->{'sambalocalsid'} = $res->[0]->{'sambasid'}->[0];
- $data->{'sambainternal'}->{'ridbase'} = $res->[0]->{'sambaalgorithmicridbase'}->[0];
+ if ( $res->[0]->{'sambaSID'}->[0] ) {
+ $data->{'sambainternal'}->{'sambalocalsid'} = $res->[0]->{'sambaSID'}->[0];
+ $data->{'sambainternal'}->{'ridbase'} = $res->[0]->{'sambaAlgorithmicRidBase'}->[0];
return undef;
} else {
return "error reading samba sid";
@@ -362,28 +362,28 @@
my ( $self, $config, $data ) = @_;
my @updated_oc;
- foreach my $oc ( @{$data->{'objectclass'}} ) {
+ foreach my $oc ( @{$data->{'objectClass'}} ) {
if ( lc($oc) ne "sambagroupmapping" ) {
push @updated_oc, $oc;
}
}
# delete( $data->{'sambainternal'});
-# delete( $data->{'sambapwdmustchange'});
-# delete( $data->{'sambapwdlastset'});
-# delete( $data->{'sambapwdcanchange'});
+# delete( $data->{'sambaPwdMustChange'});
+# delete( $data->{'sambaPwdLastSet'});
+# delete( $data->{'sambaPwdCanChange'});
# delete( $data->{'sambantpassword'});
# delete( $data->{'sambalmpassword'});
# delete( $data->{'sambaacctflags'});
-# delete( $data->{'sambahomedrive'});
-# delete( $data->{'sambahomepath'});
-# delete( $data->{'sambaprofilepath'});
-# delete( $data->{'sambalogonscript'});
-# delete( $data->{'sambasid'});
-# delete( $data->{'sambaprimarygroupssid'});
+# delete( $data->{'sambaHomeDrive'});
+# delete( $data->{'sambaHomePath'});
+# delete( $data->{'sambaProfilePath'});
+# delete( $data->{'sambaLogonScript'});
+# delete( $data->{'sambaSID'});
+# delete( $data->{'sambaPrimaryGroupSID'});
# delete( $data->{'sambanoexprire'});
# delete( $data->{'sambadisabled'});
- $data->{'objectclass'} = \@updated_oc;
+ $data->{'objectClass'} = \@updated_oc;
return undef;
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-samba-server-2.16.3/users-plugin/users_plugin_samba_groups.ycp new/yast2-samba-server-2.17.0/users-plugin/users_plugin_samba_groups.ycp
--- old/yast2-samba-server-2.16.3/users-plugin/users_plugin_samba_groups.ycp 2007-04-16 12:56:41.000000000 +0200
+++ new/yast2-samba-server-2.17.0/users-plugin/users_plugin_samba_groups.ycp 2008-08-05 10:39:17.000000000 +0200
@@ -9,7 +9,7 @@
* This is part GUI of UsersPluginSambaGroups - plugin for editing all LDAP
* attributes for Samba groups.
*
- * $Id: users_plugin_samba_groups.ycp 37483 2007-04-16 10:56:41Z locilka $
+ * $Id: users_plugin_samba_groups.ycp 49671 2008-08-05 08:39:17Z locilka $
*/
@@ -77,7 +77,7 @@
contents = `HBox(`HSpacing (1.5), `VBox(
`VSpacing(0.5),
- `TextEntry(`id(`smbName), _("Samba Group Name"), data["displayname"]:"" ),
+ `TextEntry(`id(`smbName), _("Samba Group Name"), data["displayName"]:"" ),
`VSpacing (0.5)
),
`HSpacing (1.5)
@@ -99,7 +99,7 @@
if ( ret == `next )
{
string err = UsersPluginSambaGroups::Check ( config, data);
- data["displayname"] = UI::QueryWidget(`id(`smbName), `Value );
+ data["displayName"] = UI::QueryWidget(`id(`smbName), `Value );
if (err != "")
{
Report::Error (err);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-samba-server-2.16.3/users-plugin/UsersPluginSamba.pm new/yast2-samba-server-2.17.0/users-plugin/UsersPluginSamba.pm
--- old/yast2-samba-server-2.16.3/users-plugin/UsersPluginSamba.pm 2005-09-19 13:53:25.000000000 +0200
+++ new/yast2-samba-server-2.17.0/users-plugin/UsersPluginSamba.pm 2008-08-05 10:36:18.000000000 +0200
@@ -137,7 +137,7 @@
my $config = shift;
my $data = shift;
- if ( grep /^sambasamaccount$/i, @{$data->{'objectclass'}} ) {
+ if ( grep /^sambasamaccount$/i, @{$data->{'objectClass'}} ) {
y2milestone( "SambaPlugin: Plugin Present");
return 1;
} else {
@@ -204,8 +204,8 @@
}
my $ret = $self->update_object_classes( $config, $data );
if( $ret ) {
- y2internal("Could not update objectclass attribute");
- $error = __("Could not update objectclass attribute.");
+ y2internal("Could not update objectClass attribute");
+ $error = __("Could not update objectClass attribute.");
return undef;
}
return $data;
@@ -293,7 +293,7 @@
if( ! $data->{'sambainternal'}->{'initialized'} ) {
$self->init_internal_keys( $config, $data );
$data->{'sambainternal'}->{'initialized'} = 1;
- } elsif ( (! $data->{'sambalmpassword'}) &&
+ } elsif ( (! $data->{'sambaLMPassword'}) &&
( (! $data->{'text_userpassword'} ) || ($data->{'text_userpassword'} eq "" )) ){
$error = __("Change the password to create the Samba account");
return undef;
@@ -306,7 +306,7 @@
}
$self->update_attributes ($config, $data);
- if ( (! $data->{'sambalmpassword'}) ) {
+ if ( (! $data->{'sambaLMPassword'}) ) {
y2debug ("no samba password hashes present yet");
}
@@ -329,10 +329,10 @@
my $oc = "sambaSamAccount";
# define the object class for new user/groupa
- if (defined $data->{"objectclass"} && ref $data->{"objectclass"} eq "ARRAY")
+ if (defined $data->{"objectClass"} && ref $data->{"objectClass"} eq "ARRAY")
{
- if ( ! grep /^$oc$/i, @{$data->{'objectclass'}} ) {
- push @{$data->{'objectclass'}}, $oc;
+ if ( ! grep /^$oc$/i, @{$data->{'objectClass'}} ) {
+ push @{$data->{'objectClass'}}, $oc;
y2milestone("added ObjectClass $oc");
}
}
@@ -342,10 +342,10 @@
sub init_internal_keys {
my ($self, $config, $data) = @_;
- if ( $data->{'sambaacctflags'} ) {
+ if ( $data->{'sambaAcctFlags'} ) {
if ( ! defined( $data->{'sambadisabled'} ) ) {
y2internal(" UsersPluginSamba::init_internal_keys sambadisabled undefined ");
- if ( $data->{'sambaacctflags'} =~ /^\[.*D.*\]/ ) {
+ if ( $data->{'sambaAcctFlags'} =~ /^\[.*D.*\]/ ) {
$data->{'sambadisabled'} = "1";
} else {
$data->{'sambadisabled'} = "0";
@@ -353,7 +353,7 @@
}
if ( ! defined( $data->{'sambanoexpire'} ) ) {
y2internal(" UsersPluginSamba::init_internal_keys sambanoexpire undefined ");
- if ( $data->{'sambaacctflags'} =~ /^\[.*X.*\]/ ) {
+ if ( $data->{'sambaAcctFlags'} =~ /^\[.*X.*\]/ ) {
$data->{'sambanoexpire'} = "1";
} else {
$data->{'sambanoexpire'} = "0";
@@ -367,18 +367,18 @@
my ( $self, $config, $data ) = @_;
my $SID = $data->{'sambainternal'}->{'sambalocalsid'};
- my $uidNumber = $data->{'uidnumber'};
+ my $uidNumber = $data->{'uidNumber'};
if ( $uidNumber ) {
- if ( (! $data->{'sambasid'}) || ($data->{'sambasid'} eq "") ) {
- $data->{'sambasid'} = $SID."-". ( 2 * $uidNumber +
+ if ( (! $data->{'sambaSID'}) || ($data->{'sambaSID'} eq "") ) {
+ $data->{'sambaSID'} = $SID."-". ( 2 * $uidNumber +
$data->{'sambainternal'}->{'ridbase'} );
}
}
- my $gidNumber = $data->{'gidnumber'};
+ my $gidNumber = $data->{'gidNumber'};
if ( $gidNumber ) {
- if ( (! $data->{'sambaprimarygroupsid'}) ||
- ($data->{'sambaprimarygroupsid'} eq "") ) {
- $data->{'sambaprimarygroupsid'} = $SID."-". (2 * $gidNumber +
+ if ( (! $data->{'sambaPrimaryGroupSID'}) ||
+ ($data->{'sambaPrimaryGroupSID'} eq "") ) {
+ $data->{'sambaPrimaryGroupSID'} = $SID."-". (2 * $gidNumber +
$data->{'sambainternal'}->{'ridbase'} + 1 );
}
}
@@ -398,7 +398,7 @@
sub update_samba_acctflags {
my ($self, $config, $data) = @_;
- my $acctflags = $data->{'sambaacctflags'} || "[U ]";
+ my $acctflags = $data->{'sambaAcctFlags'} || "[U ]";
$acctflags =~ s/^\[(\w+)\s*\]$/$1/g;
@@ -425,7 +425,7 @@
for( my $i=0; $i < ( 11 - $len ); $i++ ) {
$acctflags .= " ";
}
- $data->{'sambaacctflags'} = "[". $acctflags ."]";
+ $data->{'sambaAcctFlags'} = "[". $acctflags ."]";
return undef;
}
@@ -435,19 +435,19 @@
if ( $data->{'sambainternal'}->{'sambacleartextpw'} ) {
my $update_timestamp = 0;
my ($lmHash, $ntHash) = ntlmgen($data->{'sambainternal'}->{'sambacleartextpw'});
- if ( (!$data->{'sambalmpassword'}) || ($lmHash ne $data->{'sambalmpassword'}) ) {
- $data->{'sambalmpassword'} = $lmHash;
+ if ( (!$data->{'sambaLMPassword'}) || ($lmHash ne $data->{'sambaLMPassword'}) ) {
+ $data->{'sambaLMPassword'} = $lmHash;
$update_timestamp = 1;
}
- if ( (! $data->{'sambantpassword'}) || ( $ntHash ne $data->{'sambantpassword'} ) ) {
- $data->{'sambantpassword'} = $ntHash;
+ if ( (! $data->{'sambaNTPassword'}) || ( $ntHash ne $data->{'sambaNTPassword'} ) ) {
+ $data->{'sambaNTPassword'} = $ntHash;
$update_timestamp = 1;
}
if ( $update_timestamp ) {
- $data->{'sambapwdlastset'} = time ();
- $data->{'sambapwdcanchange'} = $data->{'sambapwdlastset'};
+ $data->{'sambaPwdLastSet'} = time ();
+ $data->{'sambaPwdCanChange'} = $data->{'sambaPwdLastSet'};
}
- $data->{'sambapwdmustchange'} = ( 1 << 31 ) - 1;
+ $data->{'sambaPwdMustChange'} = ( 1 << 31 ) - 1;
}
return undef;
}
@@ -460,7 +460,7 @@
my $res = SCR->Read(".ldap.search", { base_dn => $base_dn,
scope => YaST::YCP::Integer(2),
filter => "(objectClass=sambaDomain)",
- attrs => ['sambasid', 'sambaalgorithmicridbase']
+ attrs => ['sambaSID', 'sambaAlgorithmicRidBase']
}
);
if ( ! $res ){
@@ -471,9 +471,9 @@
return "error reading samba sid";
} else {
#y2milestone( Data::Dumper->Dump( [$res] ));
- if ( $res->[0]->{'sambasid'}->[0] ) {
- $data->{'sambainternal'}->{'sambalocalsid'} = $res->[0]->{'sambasid'}->[0];
- $data->{'sambainternal'}->{'ridbase'} = $res->[0]->{'sambaalgorithmicridbase'}->[0];
+ if ( $res->[0]->{'sambaSID'}->[0] ) {
+ $data->{'sambainternal'}->{'sambalocalsid'} = $res->[0]->{'sambaSID'}->[0];
+ $data->{'sambainternal'}->{'ridbase'} = $res->[0]->{'sambaAlgorithmicRidBase'}->[0];
return undef;
} else {
return "error reading samba sid";
@@ -486,7 +486,7 @@
my ( $self, $config, $data ) = @_;
my @updated_oc;
- foreach my $oc ( @{$data->{'objectclass'}} ) {
+ foreach my $oc ( @{$data->{'objectClass'}} ) {
if ( lc($oc) ne "sambasamaccount" ) {
push @updated_oc, $oc;
}
@@ -495,7 +495,7 @@
delete( $data->{'sambadisabled'});
delete( $data->{'sambainternal'});
- $data->{'objectclass'} = \@updated_oc;
+ $data->{'objectClass'} = \@updated_oc;
}
1;
# EOF
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-samba-server-2.16.3/users-plugin/users_plugin_samba.ycp new/yast2-samba-server-2.17.0/users-plugin/users_plugin_samba.ycp
--- old/yast2-samba-server-2.16.3/users-plugin/users_plugin_samba.ycp 2004-08-10 15:18:43.000000000 +0200
+++ new/yast2-samba-server-2.17.0/users-plugin/users_plugin_samba.ycp 2008-08-05 10:39:17.000000000 +0200
@@ -9,7 +9,7 @@
* This is part GUI of UsersPluginSamba - plugin for editing all LDAP
* user/group attributes.
*
- * $Id: users_plugin_samba.ycp 18486 2004-08-10 13:18:43Z mlazar $
+ * $Id: users_plugin_samba.ycp 49671 2008-08-05 08:39:17Z locilka $
*/
@@ -74,33 +74,33 @@
`VSpacing(0.5),
`Frame ( _("Home Drive"),
`VBox(
- `TextEntry(`id(`homeDrive), "", data["sambahomedrive"]:"" ),
+ `TextEntry(`id(`homeDrive), "", data["sambaHomeDrive"]:"" ),
`Left(`CheckBox( `id(`defhomeDrive ), `opt(`notify), _("Use Default Values"),
- size (data["sambahomedrive"]:"") <= 0
+ size (data["sambaHomeDrive"]:"") <= 0
))
)
),
`Frame ( _("Home Path"),
`VBox(
- `TextEntry(`id(`homePath), "", data["sambahomepath"]:"" ),
+ `TextEntry(`id(`homePath), "", data["sambaHomePath"]:"" ),
`Left(`CheckBox( `id(`defhomePath ), `opt(`notify), _("Use Default Values"),
- size (data["sambahomepath"]:"") <= 0
+ size (data["sambaHomePath"]:"") <= 0
))
)
),
`Frame ( _("Profile Path"),
`VBox(
- `TextEntry(`id(`profilePath), "", data["sambaprofilepath"]:"" ),
+ `TextEntry(`id(`profilePath), "", data["sambaProfilePath"]:"" ),
`Left(`CheckBox( `id(`defprofilePath ), `opt(`notify), _("Use Default Values"),
- size (data["sambaprofilepath"]:"") <= 0))
+ size (data["sambaProfilePath"]:"") <= 0))
)
),
// translators: logon is the Windows synonym for login
`Frame ( _("Logon Script"),
`VBox(
- `TextEntry(`id(`logonScript), "", data["sambalogonscript"]:"" ),
+ `TextEntry(`id(`logonScript), "", data["sambaLogonScript"]:"" ),
`Left(`CheckBox( `id(`deflogonScript ), `opt(`notify), _("Use Default Values"),
- size (data["sambalogonscript"]:"") <= 0))
+ size (data["sambaLogonScript"]:"") <= 0))
)
),
`VSpacing (1.5),
@@ -138,35 +138,35 @@
string err = UsersPluginSamba::Check ( config, data);
if ((boolean) UI::QueryWidget(`id(`defhomeDrive), `Value))
{
- data["sambahomedrive"] = "";
+ data["sambaHomeDrive"] = "";
}
else
{
- data["sambahomedrive"] = UI::QueryWidget(`id(`homeDrive), `Value );
+ data["sambaHomeDrive"] = UI::QueryWidget(`id(`homeDrive), `Value );
}
if ((boolean) UI::QueryWidget(`id(`defhomePath), `Value))
{
- data["sambahomepath"] = "";
+ data["sambaHomePath"] = "";
}
else
{
- data["sambahomepath"] = UI::QueryWidget(`id(`homePath), `Value );
+ data["sambaHomePath"] = UI::QueryWidget(`id(`homePath), `Value );
}
if ((boolean) UI::QueryWidget(`id(`defprofilePath), `Value))
{
- data["sambaprofilepath"] = "";
+ data["sambaProfilePath"] = "";
}
else
{
- data["sambaprofilepath"] = UI::QueryWidget(`id(`profilePath), `Value );
+ data["sambaProfilePath"] = UI::QueryWidget(`id(`profilePath), `Value );
}
if ((boolean) UI::QueryWidget(`id(`deflogonScript), `Value))
{
- data["sambalogonscript"] = "";
+ data["sambaLogonScript"] = "";
}
else
{
- data["sambalogonscript"] = UI::QueryWidget(`id(`logonScript), `Value );
+ data["sambaLogonScript"] = UI::QueryWidget(`id(`logonScript), `Value );
}
data["sambanoexpire"] = ( UI::QueryWidget(`id(`noExpire), `Value ) == true ) ? "1" : "0";
data["sambadisabled"] = ( UI::QueryWidget(`id(`disable), `Value ) == true ) ? "1" : "0";
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-samba-server-2.16.3/VERSION new/yast2-samba-server-2.17.0/VERSION
--- old/yast2-samba-server-2.16.3/VERSION 2008-05-06 11:21:52.000000000 +0200
+++ new/yast2-samba-server-2.17.0/VERSION 2008-08-05 10:39:09.000000000 +0200
@@ -1 +1 @@
-2.16.3
+2.17.0
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org