diff options
Diffstat (limited to 'packaging/Caldera/OpenLinux')
| -rwxr-xr-x | packaging/Caldera/OpenLinux/findsmb | 4 | ||||
| -rw-r--r-- | packaging/Caldera/OpenLinux/samba3.spec.tmpl | 15 |
2 files changed, 2 insertions, 17 deletions
diff --git a/packaging/Caldera/OpenLinux/findsmb b/packaging/Caldera/OpenLinux/findsmb index f70d18dcbd..986c248177 100755 --- a/packaging/Caldera/OpenLinux/findsmb +++ b/packaging/Caldera/OpenLinux/findsmb @@ -73,7 +73,7 @@ foreach $ip (@ipaddrs) # loop through each IP address found $name = "unknown nis name"; } } else { - /(.{1,15})\s+<00>\s+/; + /(\S+)/; $name = $1; } @@ -103,7 +103,7 @@ foreach $ip (@ipaddrs) # loop through each IP address found @name = grep(/<00> - <GROUP>/,@nmblookup); $_ = @name[0]; if ($_) { - /(.{1,15})\s+<00>\s+/; + /(\S+)/; $_ = "[$1]"; } else { $_ = "Unknown Workgroup"; diff --git a/packaging/Caldera/OpenLinux/samba3.spec.tmpl b/packaging/Caldera/OpenLinux/samba3.spec.tmpl index 23ebcd879e..d48d860e0b 100644 --- a/packaging/Caldera/OpenLinux/samba3.spec.tmpl +++ b/packaging/Caldera/OpenLinux/samba3.spec.tmpl @@ -254,15 +254,6 @@ CFLAGS="$RPM_OPT_FLAGS" LDFLAGS="-s" ./configure \ make all nsswitch/libnss_wins.so nsswitch/libnss_winbind.so torture nsswitch/pam_winbind.so everything (cd tdb; make tdbdump tdbtest tdbtorture tdbtool) -cd ../examples/VFS -CFLAGS="$RPM_OPT_FLAGS" LDFLAGS="-s" ./configure \ - --prefix='$(DESTDIR)/usr' \ - --localstatedir='$(DESTDIR)/var' \ - --libdir='$(DESTDIR)%{EtcSamba}' \ - --sbindir='$(DESTDIR)/usr/sbin' -make -cd block -make %Install %{mkDESTDIR} @@ -273,7 +264,6 @@ mkdir -p $DESTDIR%{EtcSamba}/codepages/src mkdir -p $DESTDIR/etc/skel/Samba mkdir -p $DESTDIR/home/samba mkdir -p $DESTDIR/lib/security -mkdir -p $DESTDIR/lib/samba mkdir -p $DESTDIR/%{LSBservedir}/{netlogon,profiles,Public} mkdir -p $DESTDIR%{NKinetdir} mkdir -p $DESTDIR/{sbin,bin,usr/{sbin,bin}} @@ -304,11 +294,6 @@ for i in tdbdump tdbtest tdbtorture tdbtool do install -m 755 source/tdb/$i $DESTDIR/usr/sbin done -# Add VFS Modules -for i in audit.so recycle.so block/block.so -do - install -m755 $i $DESTDIR/lib/samba -done #mv $DESTDIR/usr/bin/{make,add,conv}* $DESTDIR/usr/sbin |