diff options
| author | Johannes Winkelmann <jw@smts.ch> | 2006-02-23 15:26:10 +0000 |
|---|---|---|
| committer | Johannes Winkelmann <jw@smts.ch> | 2006-02-23 15:26:10 +0000 |
| commit | bdea7e6c6a535e57a07d376a3139d0788efaaa41 (patch) | |
| tree | 1a7334c99fa39b1ad1a7a35c113b18cb0d92413c /linneighborhood/linneighborhood-0.6.5.patch | |
| download | opt-bdea7e6c6a535e57a07d376a3139d0788efaaa41.tar.gz opt-bdea7e6c6a535e57a07d376a3139d0788efaaa41.tar.xz | |
create branch for 2.2
Diffstat (limited to 'linneighborhood/linneighborhood-0.6.5.patch')
| -rw-r--r-- | linneighborhood/linneighborhood-0.6.5.patch | 74 |
1 files changed, 74 insertions, 0 deletions
diff --git a/linneighborhood/linneighborhood-0.6.5.patch b/linneighborhood/linneighborhood-0.6.5.patch new file mode 100644 index 000000000..ca9cebf7a --- /dev/null +++ b/linneighborhood/linneighborhood-0.6.5.patch @@ -0,0 +1,74 @@ +diff -Nru LinNeighborhood-0.6.5.orig/src/smbmount.c LinNeighborhood-0.6.5/src/smbmount.c +--- LinNeighborhood-0.6.5.orig/src/smbmount.c 2004-08-26 17:56:00.689639647 +0200 ++++ LinNeighborhood-0.6.5/src/smbmount.c 2004-08-26 17:56:16.869431443 +0200 +@@ -390,10 +390,16 @@ + escape_str(smbuser,&strlist),escape_str(smbpasswd,&strlist)); + break; + case SMBMOUNT_206: +- sprintf(commandstr,"%s %s %s -o username=%s%%%s,fmask=%d,dmask=%d,uid=%d,gid=%d,ip=%s,debug=0%s", ++ sprintf(commandstr,"%s %s %s -o username=%s%%%s,fmask=%d,dmask=%d,uid=%d,gid=%d,debug=0%s", + escape_str(pref_get_smbmount_exe(),&strlist),escape_str(servicename,&strlist),escape_str(mount_point,&strlist), + escape_str(smbuser,&strlist),escape_str(smbpasswd,&strlist), +- filemode,dirmode,uid,gid,ipaddr,opt_group); ++ filemode,dirmode,uid,gid,opt_group); ++ ++ if (ipaddr && *ipaddr) { ++ string_ncat(commandstr, ",ip=", MAXMNTCOMMANDL); ++ string_ncat(commandstr, ipaddr, MAXMNTCOMMANDL); ++ } ++ + if ( (port >= 0) && (port < 65536) ) + { + sprintf(commandstr, "%s,port=%d", commandstr, port); +@@ -485,8 +491,14 @@ + { + argv[++argnr]="-o"; + argv[++argnr]=commandstr; +- sprintf(commandstr,"username=%s%%%s,fmask=%d,dmask=%d,uid=%d,gid=%d,ip=%s,debug=0", +- smbuser,smbpasswd,filemode,dirmode,uid,gid,ipaddr); ++ sprintf(commandstr,"username=%s%%%s,fmask=%d,dmask=%d,uid=%d,gid=%d,debug=0", ++ smbuser,smbpasswd,filemode,dirmode,uid,gid); ++ ++ if (ipaddr && *ipaddr) { ++ string_ncat(commandstr, ",ip=", MAXMNTCOMMANDL); ++ string_ncat(commandstr, ipaddr, MAXMNTCOMMANDL); ++ } ++ + if (*group_name) + { + strcat(commandstr,",workgroup="); +@@ -573,9 +585,15 @@ + pref_get_smbmount_exe(),servicename,mount_point,ipaddr,opt_group,smbuser,dummysmbpasswd); + break; + case SMBMOUNT_206: +- sprintf(commandstr,"%s %s %s -o username=%s%%%s,fmask=%d,dmask=%d,uid=%d,gid=%d,ip=%s,debug=0%s", ++ sprintf(commandstr,"%s %s %s -o username=%s%%%s,fmask=%d,dmask=%d,uid=%d,gid=%d,debug=0%s", + pref_get_smbmount_exe(),servicename,mount_point,smbuser,dummysmbpasswd, +- filemode,dirmode,uid,gid,ipaddr,opt_group); ++ filemode,dirmode,uid,gid,opt_group); ++ ++ if (ipaddr && *ipaddr) { ++ string_ncat(commandstr, ",ip=", MAXMNTCOMMANDL); ++ string_ncat(commandstr, ipaddr, MAXMNTCOMMANDL); ++ } ++ + if ( (port >= 0) && (port < 65536) ) + { + string_ncat(commandstr, ",port=", MAXMNTCOMMANDL); +@@ -621,8 +639,14 @@ + sprintf(userpasswd,"-U%s%%%s",smbuser,dummysmbpasswd); + else + { +- sprintf(commandstr,"username=%s%%%s,fmask=%d,dmask=%d,uid=%d,gid=%d,ip=%s,debug=0", +- smbuser,dummysmbpasswd,filemode,dirmode,uid,gid,ipaddr); ++ sprintf(commandstr,"username=%s%%%s,fmask=%d,dmask=%d,uid=%d,gid=%d,debug=0", ++ smbuser,dummysmbpasswd,filemode,dirmode,uid,gid); ++ ++ if (ipaddr && *ipaddr) { ++ string_ncat(commandstr, ",ip=", MAXMNTCOMMANDL); ++ string_ncat(commandstr, ipaddr, MAXMNTCOMMANDL); ++ } ++ + if (*group_name){ + strcat(commandstr,",workgroup="); + strcat(commandstr,group_name); |