07234b4379
Samba3 patch is updated again so it applies after the new serive function update (#29075). I just tested it on my router and everything (still) seems to work. So please commit it. Through all versions these things are added to the original package in the repositories: * Updates samba3 package to version 3.0.37 * Splits nmbd and mountcifs into separate packages * Added settings to remove printing support and to make smbd even smaller * Removed LDAP, Kerebos and AD support * Added iconv support Signed-off-by: Maarten Bezemer <m.m.bezemer@utwente.nl> git-svn-id: svn://svn.openwrt.org/openwrt/packages@29343 3c298f89-4303-0410-b956-a3cf2f4a3e73
49 lines
1.3 KiB
Diff
49 lines
1.3 KiB
Diff
Index: samba-3.0.37/source/popt/popt.c
|
|
===================================================================
|
|
--- samba-3.0.37.orig/source/popt/popt.c 2011-04-11 23:35:04.000000000 +0200
|
|
+++ samba-3.0.37/source/popt/popt.c 2011-04-11 23:35:10.000000000 +0200
|
|
@@ -10,13 +10,14 @@
|
|
|
|
#include "system.h"
|
|
|
|
-#if HAVE_FLOAT_H
|
|
+//#if HAVE_FLOAT_H
|
|
#include <float.h>
|
|
-#endif
|
|
+//#endif
|
|
#include <math.h>
|
|
|
|
#include "findme.h"
|
|
#include "poptint.h"
|
|
+#include "../include/config.h"
|
|
|
|
#ifdef MYDEBUG
|
|
/*@unchecked@*/
|
|
@@ -388,7 +389,7 @@
|
|
sprintf(s, "%s/%s", con->execPath, item->argv[0]);
|
|
argv[argc] = s;
|
|
} else {
|
|
- argv[argc] = findProgramPath(item->argv[0]);
|
|
+ argv[argc] = ""/*findProgramPath(item->argv[0])*/;
|
|
}
|
|
if (argv[argc++] == NULL) return POPT_ERROR_NOARG;
|
|
|
|
@@ -1246,4 +1247,3 @@
|
|
|
|
return numargs;
|
|
}
|
|
-/*@=boundswrite@*/
|
|
Index: samba-3.0.37/source/modules/vfs_default.c
|
|
===================================================================
|
|
--- samba-3.0.37.orig/source/modules/vfs_default.c 2011-04-11 23:35:08.000000000 +0200
|
|
+++ samba-3.0.37/source/modules/vfs_default.c 2011-04-11 23:35:10.000000000 +0200
|
|
@@ -977,7 +977,7 @@
|
|
|
|
START_PROFILE(syscall_linux_setlease);
|
|
|
|
-#ifdef LINUX
|
|
+#if defined(LINUX) && defined(HAVE_KERNEL_OPLOCKS_LINUX)
|
|
/* first set the signal handler */
|
|
if(linux_set_lease_sighandler(fd) == -1)
|
|
return -1;
|