Mailinglist Archive: yast-commit (1184 mails)

< Previous Next >
[yast-commit] r50690 - in /trunk/samba-server: VERSION package/yast2-samba-server.changes src/SambaBackendLDAP.pm yast2-samba-server.spec.in
  • From: locilka@xxxxxxxxxxxxxxxx
  • Date: Thu, 04 Sep 2008 13:41:21 -0000
  • Message-id: <20080904134121.7C08D30C23@xxxxxxxxxxxxxxxx>
Author: locilka
Date: Thu Sep 4 15:41:21 2008
New Revision: 50690

URL: http://svn.opensuse.org/viewcvs/yast?rev=50690&view=rev
Log:
- Adapted to yast2-ldap API changes (patch created by rhafer)
(bnc #422524)
- Adjusted RPM dependencies.
- 2.17.1


Modified:
trunk/samba-server/VERSION
trunk/samba-server/package/yast2-samba-server.changes
trunk/samba-server/src/SambaBackendLDAP.pm
trunk/samba-server/yast2-samba-server.spec.in

Modified: trunk/samba-server/VERSION
URL:
http://svn.opensuse.org/viewcvs/yast/trunk/samba-server/VERSION?rev=50690&r1=50689&r2=50690&view=diff
==============================================================================
--- trunk/samba-server/VERSION (original)
+++ trunk/samba-server/VERSION Thu Sep 4 15:41:21 2008
@@ -1 +1 @@
-2.17.0
+2.17.1

Modified: trunk/samba-server/package/yast2-samba-server.changes
URL:
http://svn.opensuse.org/viewcvs/yast/trunk/samba-server/package/yast2-samba-server.changes?rev=50690&r1=50689&r2=50690&view=diff
==============================================================================
--- trunk/samba-server/package/yast2-samba-server.changes (original)
+++ trunk/samba-server/package/yast2-samba-server.changes Thu Sep 4 15:41:21
2008
@@ -1,4 +1,12 @@
-------------------------------------------------------------------
+Thu Sep 4 15:34:33 CEST 2008 - locilka@xxxxxxx
+
+- Adapted to yast2-ldap API changes (patch created by rhafer)
+ (bnc #422524)
+- Adjusted RPM dependencies.
+- 2.17.1
+
+-------------------------------------------------------------------
Tue Aug 5 10:36:39 CEST 2008 - locilka@xxxxxxx

- Adjusted to the newest LDAP SCR agent (patch written by jsuchome)

Modified: trunk/samba-server/src/SambaBackendLDAP.pm
URL:
http://svn.opensuse.org/viewcvs/yast/trunk/samba-server/src/SambaBackendLDAP.pm?rev=50690&r1=50689&r2=50690&view=diff
==============================================================================
--- trunk/samba-server/src/SambaBackendLDAP.pm (original)
+++ trunk/samba-server/src/SambaBackendLDAP.pm Thu Sep 4 15:41:21 2008
@@ -167,7 +167,6 @@
}
return unless DNS->IsHostLocal($url->{host});

- my $restart_server;
my $suffix = SambaConfig->GlobalGetStr("ldap suffix", "");
my $admin_dn = SambaConfig->GlobalGetStr("ldap admin dn", "");

@@ -176,8 +175,6 @@
if (not defined $ret) {
y2error("Add LDAP Samba3 schema failed");
return;
- } elsif ($ret) {
- $restart_server = 1;
}

# add indices
@@ -186,26 +183,15 @@
if (not defined $ret) {
y2error("Add Index '$_' failed");
return;
- } elsif ($ret) {
- $restart_server = 1;
}
}

# setup ACLs
if ($admin_dn) {
- $ret = LdapServerAccess->AddSambaACLHack($admin_dn, 0);
+ $ret = LdapServerAccess->AddSambaACL($admin_dn, $suffix);
if (not defined $ret) {
- y2error("Samba ACL Hack failed");
+ y2error("adding Samba ACLs failed");
return;
- } elsif ($ret) {
- $restart_server = 1;
- }
- }
-
- # restart server if running
- if ($restart_server && not Service->Status("ldap")) {
- unless (Service->Restart("ldap")) {
- y2error("Error when restarting service 'ldap'");
}
}
}

Modified: trunk/samba-server/yast2-samba-server.spec.in
URL:
http://svn.opensuse.org/viewcvs/yast/trunk/samba-server/yast2-samba-server.spec.in?rev=50690&r1=50689&r2=50690&view=diff
==============================================================================
--- trunk/samba-server/yast2-samba-server.spec.in (original)
+++ trunk/samba-server/yast2-samba-server.spec.in Thu Sep 4 15:41:21 2008
@@ -5,8 +5,10 @@

Requires: perl-Crypt-SmbHash
Requires: yast2
+Requires: yast2-ldap >= 2.17.3
Requires: yast2-ldap-client
Requires: yast2-perl-bindings
+Requires: yast2-network
# SambaNetJoin::Join
Requires: yast2-samba-client >= 2.16.5
Requires: yast2-users

--
To unsubscribe, e-mail: yast-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: yast-commit+help@xxxxxxxxxxxx

< Previous Next >
This Thread
  • No further messages