/[smeserver]/rpms/e-smith-samba/sme8/e-smith-samba-2.2.0-store_ldap_pw.patch
ViewVC logotype

Diff of /rpms/e-smith-samba/sme8/e-smith-samba-2.2.0-store_ldap_pw.patch

Parent Directory Parent Directory | Revision Log Revision Log | View Revision Graph Revision Graph | View Patch Patch

Revision 1.1 by vip-ire, Wed Nov 3 17:56:50 2010 UTC Revision 1.2 by vip-ire, Wed Nov 3 18:21:39 2010 UTC
# Line 1  Line 1 
1  diff -Nur -x '*.orig' -x '*.rej' e-smith-samba-2.2.0/createlinks mezzanine_patched_e-smith-samba-2.2.0/createlinks  diff -Nur -x '*.orig' -x '*.rej' e-smith-samba-2.2.0/createlinks mezzanine_patched_e-smith-samba-2.2.0/createlinks
2  --- e-smith-samba-2.2.0/createlinks     2010-11-03 18:55:23.000000000 +0100  --- e-smith-samba-2.2.0/createlinks     2010-11-03 19:12:38.000000000 +0100
3  +++ mezzanine_patched_e-smith-samba-2.2.0/createlinks   2010-11-03 18:29:07.000000000 +0100  +++ mezzanine_patched_e-smith-samba-2.2.0/createlinks   2010-11-03 19:12:36.000000000 +0100
4  @@ -33,6 +33,7 @@  @@ -29,6 +29,12 @@
5         templates2events($file, qw(console-save bootstrap-console-save));
6     }
7    
8   $event = "bootstrap-ldap-save";  +foreach (qw(console-save bootstrap-console-save bootstrap-ldap-save
9   templates2events("/etc/samba/smb.conf", $event);  +            post-install post-upgrade workgroup-update))
10  +event_link("store-ldap-passwd", $event, "06");  +{
11   event_link("update-domain-group-maps", $event, "56");  +    event_link('store-ldap-smbpasswd', $_, "06");
12    +}
13    +
14     my $event = "console-save";
15    
16   $event = "group-create";   $event = "bootstrap-ldap-save";
17  diff -Nur -x '*.orig' -x '*.rej' e-smith-samba-2.2.0/root/etc/e-smith/events/actions/store-ldap-passwd mezzanine_patched_e-smith-samba-2.2.0/root/etc/e-smith/events/actions/store-ldap-passwd  diff -Nur -x '*.orig' -x '*.rej' e-smith-samba-2.2.0/root/etc/e-smith/events/actions/store-ldap-smbpasswd mezzanine_patched_e-smith-samba-2.2.0/root/etc/e-smith/events/actions/store-ldap-smbpasswd
18  --- e-smith-samba-2.2.0/root/etc/e-smith/events/actions/store-ldap-passwd       1970-01-01 01:00:00.000000000 +0100  --- e-smith-samba-2.2.0/root/etc/e-smith/events/actions/store-ldap-smbpasswd    1970-01-01 01:00:00.000000000 +0100
19  +++ mezzanine_patched_e-smith-samba-2.2.0/root/etc/e-smith/events/actions/store-ldap-passwd     2010-11-03 18:55:21.000000000 +0100  +++ mezzanine_patched_e-smith-samba-2.2.0/root/etc/e-smith/events/actions/store-ldap-smbpasswd  2010-11-03 19:10:59.000000000 +0100
20  @@ -0,0 +1,40 @@  @@ -0,0 +1,40 @@
21  +#!/usr/bin/perl -w  +#!/usr/bin/perl -w
22  +  +
# Line 54  diff -Nur -x '*.orig' -x '*.rej' e-smith Line 59  diff -Nur -x '*.orig' -x '*.rej' e-smith
59  +die "Error storing LDAP password in secret.tdb\n" unless  +die "Error storing LDAP password in secret.tdb\n" unless
60  +    system('/usr/bin/smbpasswd', '-w', "$pw") == 0;  +    system('/usr/bin/smbpasswd', '-w', "$pw") == 0;
61  diff -Nur -x '*.orig' -x '*.rej' e-smith-samba-2.2.0/root/etc/e-smith/events/actions/update-domain-group-maps mezzanine_patched_e-smith-samba-2.2.0/root/etc/e-smith/events/actions/update-domain-group-maps  diff -Nur -x '*.orig' -x '*.rej' e-smith-samba-2.2.0/root/etc/e-smith/events/actions/update-domain-group-maps mezzanine_patched_e-smith-samba-2.2.0/root/etc/e-smith/events/actions/update-domain-group-maps
62  --- e-smith-samba-2.2.0/root/etc/e-smith/events/actions/update-domain-group-maps        2010-11-03 18:55:23.000000000 +0100  --- e-smith-samba-2.2.0/root/etc/e-smith/events/actions/update-domain-group-maps        2010-11-03 19:12:38.000000000 +0100
63  +++ mezzanine_patched_e-smith-samba-2.2.0/root/etc/e-smith/events/actions/update-domain-group-maps      2010-11-03 18:29:53.000000000 +0100  +++ mezzanine_patched_e-smith-samba-2.2.0/root/etc/e-smith/events/actions/update-domain-group-maps      2010-11-03 19:10:59.000000000 +0100
64  @@ -18,13 +18,6 @@  @@ -18,13 +18,6 @@
65   my $ldapauth = $c->get('ldap')->prop('Authentication') || 'disabled';   my $ldapauth = $c->get('ldap')->prop('Authentication') || 'disabled';
66   my $pw = esmith::util::LdapPassword();   my $pw = esmith::util::LdapPassword();
# Line 71  diff -Nur -x '*.orig' -x '*.rej' e-smith Line 76  diff -Nur -x '*.orig' -x '*.rej' e-smith
76   unless ($g =~ /SID.*is: (.+)/) {   unless ($g =~ /SID.*is: (.+)/) {
77       warn "Unable to determine SID.  Clearning cache to see if it helps.";       warn "Unable to determine SID.  Clearning cache to see if it helps.";
78  diff -Nur -x '*.orig' -x '*.rej' e-smith-samba-2.2.0/root/var/service/smbd/run mezzanine_patched_e-smith-samba-2.2.0/root/var/service/smbd/run  diff -Nur -x '*.orig' -x '*.rej' e-smith-samba-2.2.0/root/var/service/smbd/run mezzanine_patched_e-smith-samba-2.2.0/root/var/service/smbd/run
79  --- e-smith-samba-2.2.0/root/var/service/smbd/run       2010-11-03 18:55:23.000000000 +0100  --- e-smith-samba-2.2.0/root/var/service/smbd/run       2010-11-03 19:12:38.000000000 +0100
80  +++ mezzanine_patched_e-smith-samba-2.2.0/root/var/service/smbd/run     2010-11-03 18:29:31.000000000 +0100  +++ mezzanine_patched_e-smith-samba-2.2.0/root/var/service/smbd/run     2010-11-03 19:10:59.000000000 +0100
81  @@ -41,10 +41,5 @@  @@ -41,10 +41,5 @@
82       [ -r "$tdb" ] && tdbbackup "$tdb" .bak       [ -r "$tdb" ] && tdbbackup "$tdb" .bak
83   done   done

Legend:
Removed lines/characters  
Changed lines/characters
  Added lines/characters
admin@koozali.org
 ViewVC Help
Powered by ViewVC 1.2.1 RSS 2.0 feed