/[smeserver]/rpms/e-smith-backup/sme8/e-smith-backup-2.2.0-CIFScredentials.patch
ViewVC logotype

Contents of /rpms/e-smith-backup/sme8/e-smith-backup-2.2.0-CIFScredentials.patch

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

Revision 1.1 - (show annotations) (download)
Wed Aug 26 17:34:27 2009 UTC (14 years, 9 months ago) by snetram
Branch: MAIN
CVS Tags: e-smith-backup-2_2_0-62_el5_sme, e-smith-backup-2_2_0-30_el5_sme, e-smith-backup-2_2_0-72_el5_sme, e-smith-backup-2_2_0-40_el5_sme, e-smith-backup-2_2_0-27_el5_sme, e-smith-backup-2_2_0-60_el5_sme, e-smith-backup-2_2_0-26_el5_sme, e-smith-backup-2_2_0-25_el5_sme, e-smith-backup-2_2_0-66_el5_sme, e-smith-backup-2_2_0-65_el5_sme, e-smith-backup-2_2_0-80_el5_sme, e-smith-backup-2_2_0-44_el5_sme, e-smith-backup-2_2_0-83_el5_sme, e-smith-backup-2_2_0-41_el5_sme, e-smith-backup-2_2_0-52_el5_sme, e-smith-backup-2_2_0-82_el5_sme, e-smith-backup-2_2_0-38_el5_sme, e-smith-backup-2_2_0-88_el5_sme, e-smith-backup-2_2_0-74_el5_sme, e-smith-backup-2_2_0-55_el5_sme, e-smith-backup-2_2_0-24_el5_sme, e-smith-backup-2_2_0-84_el5_sme, e-smith-backup-2_2_0-63_el5_sme, e-smith-backup-2_2_0-87_el5_sme, e-smith-backup-2_2_0-64_el5_sme, e-smith-backup-2_2_0-43_el5_sme, e-smith-backup-2_2_0-48_el5_sme, e-smith-backup-2_2_0-36_el5_sme, e-smith-backup-2_2_0-81_el5_sme, e-smith-backup-2_2_0-68_el5_sme, e-smith-backup-2_2_0-35_el5_sme, e-smith-backup-2_2_0-86_el5_sme, e-smith-backup-2_2_0-22_el5_sme, e-smith-backup-2_2_0-34_el5_sme, e-smith-backup-2_2_0-50_el5_sme, e-smith-backup-2_2_0-51_el5_sme, e-smith-backup-2_2_0-71_el5_sme, e-smith-backup-2_2_0-23_el5_sme, e-smith-backup-2_2_0-61_el5_sme, e-smith-backup-2_2_0-57_el5_sme, e-smith-backup-2_2_0-78_el5_sme, e-smith-backup-2_2_0-73_el5_sme, e-smith-backup-2_2_0-79_el5_sme, e-smith-backup-2_2_0-39_el5_sme, e-smith-backup-2_2_0-33_el5_sme, e-smith-backup-2_2_0-75_el5_sme, e-smith-backup-2_2_0-28_el5_sme, e-smith-backup-2_2_0-76_el5_sme, e-smith-backup-2_2_0-56_el5_sme, e-smith-backup-2_2_0-58_el5_sme, e-smith-backup-2_2_0-45_el5_sme, e-smith-backup-2_2_0-59_el5_sme, e-smith-backup-2_2_0-32_el5_sme, e-smith-backup-2_2_0-53_el5_sme, e-smith-backup-2_2_0-67_el5_sme, e-smith-backup-2_2_0-42_el5_sme, e-smith-backup-2_2_0-29_el5_sme, e-smith-backup-2_2_0-70_el5_sme, e-smith-backup-2_2_0-77_el5_sme, e-smith-backup-2_2_0-54_el5_sme, e-smith-backup-2_2_0-85_el5_sme, e-smith-backup-2_2_0-69_el5_sme, e-smith-backup-2_2_0-37_el5_sme, e-smith-backup-2_2_0-31_el5_sme, e-smith-backup-2_2_0-49_el5_sme, e-smith-backup-2_2_0-47_el5_sme, e-smith-backup-2_2_0-46_el5_sme, HEAD 
* Wed Aug 26 2009 Jean-Paul Leclere <jean-paul@leclere.org> 2.2.0-22.sme
- workstation backup: using credentials file for cifs mount [SME: 5442]
- workstation backup: add cifs credentials expand to bootstrap-console-save [SME: 5442]
1 diff -up e-smith-backup-2.0.0/createlinks.CIFScredentials e-smith-backup-2.0.0/createlinks
2 --- e-smith-backup-2.0.0/createlinks.CIFScredentials 2008-10-07 19:34:31.000000000 +0200
3 +++ e-smith-backup-2.0.0/createlinks 2009-08-25 20:11:57.000000000 +0200
4 @@ -32,6 +32,7 @@ event_link("reset-restore-idle-flag", $e
5 $event = "conf-backup";
6
7 templates2events("/etc/crontab", $event);
8 +templates2events("/etc/dar/CIFScredentials", $event);
9
10 #--------------------------------------------------
11 # events for pre-backup action
12 diff -up e-smith-backup-2.0.0/root/etc/e-smith/events/actions/workstation-backup-dar.CIFScredentials e-smith-backup-2.0.0/root/etc/e-smith/events/actions/workstation-backup-dar
13 --- e-smith-backup-2.0.0/root/etc/e-smith/events/actions/workstation-backup-dar.CIFScredentials 2009-08-25 19:57:09.000000000 +0200
14 +++ e-smith-backup-2.0.0/root/etc/e-smith/events/actions/workstation-backup-dar 2009-08-25 20:08:32.000000000 +0200
15 @@ -122,7 +122,7 @@ if ($err)
16
17 if ($VFSType eq 'cifs')
18 {
19 - $err = qx(/bin/mount -t cifs "$smbhost:$smbshare" $mntdir -o user=$login,pass=$password 2>&1);
20 + $err = qx(/bin/mount -t cifs "$smbhost:$smbshare" $mntdir -o credentials=/etc/dar/CIFScredentials,nounix 2>&1);
21 ldie("Error while mounting $smbhost:$smbshare : \n" . $err) if $err;
22 }
23 elsif ($VFSType eq 'nfs')
24 diff -up e-smith-backup-2.0.0/root/etc/e-smith/templates/etc/dar/CIFScredentials/template-begin.CIFScredentials e-smith-backup-2.0.0/root/etc/e-smith/templates/etc/dar/CIFScredentials/template-begin
25 --- e-smith-backup-2.0.0/root/etc/e-smith/templates/etc/dar/CIFScredentials/template-begin.CIFScredentials 2009-08-25 20:02:17.000000000 +0200
26 +++ e-smith-backup-2.0.0/root/etc/e-smith/templates/etc/dar/CIFScredentials/template-begin 2009-08-23 18:23:00.000000000 +0200
27 @@ -0,0 +1,2 @@
28 +username={$backupwk{'Login'}}
29 +password={$backupwk{'Password'}}
30 diff -up e-smith-backup-2.0.0/root/etc/e-smith/templates.metadata/etc/dar/CIFScredentials.CIFScredentials e-smith-backup-2.0.0/root/etc/e-smith/templates.metadata/etc/dar/CIFScredentials
31 --- e-smith-backup-2.0.0/root/etc/e-smith/templates.metadata/etc/dar/CIFScredentials.CIFScredentials 2009-08-25 20:05:59.000000000 +0200
32 +++ e-smith-backup-2.0.0/root/etc/e-smith/templates.metadata/etc/dar/CIFScredentials 2009-08-23 22:18:00.000000000 +0200
33 @@ -0,0 +1 @@
34 +PERMS=0600
35 diff -up e-smith-backup-2.0.0/root/etc/e-smith/web/functions/backup.CIFScredentials e-smith-backup-2.0.0/root/etc/e-smith/web/functions/backup
36 --- e-smith-backup-2.0.0/root/etc/e-smith/web/functions/backup.CIFScredentials 2009-08-25 19:57:09.000000000 +0200
37 +++ e-smith-backup-2.0.0/root/etc/e-smith/web/functions/backup 2009-08-25 20:10:13.000000000 +0200
38 @@ -3234,7 +3234,7 @@ sub dmount()
39
40 if ($VFSType eq 'cifs')
41 {
42 - return ( qx(/bin/mount -t cifs "$host:$share" $mountdir -o user=$login,pass=$password) );
43 + return ( qx(/bin/mount -t cifs "$host:$share" $mountdir -o credentials=/etc/dar/CIFScredentials,nounix) );
44 }
45 elsif ($VFSType eq 'nfs')
46 {
admin@koozali.org
 ViewVC Help
Powered by ViewVC 1.2.1 RSS 2.0 feed