aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJonas Gorski <jogo@openwrt.org>2013-02-16 11:39:42 +0000
committerJonas Gorski <jogo@openwrt.org>2013-02-16 11:39:42 +0000
commitea88007d4b398b536f7ce9214a64cefff73283c3 (patch)
tree2652a4d3cafa044595e89fa338d5cc46658ee986
parent8477ad22f699ef11dc2793a66a3f9030c0863e7f (diff)
downloadupstream-ea88007d4b398b536f7ce9214a64cefff73283c3.tar.gz
upstream-ea88007d4b398b536f7ce9214a64cefff73283c3.tar.bz2
upstream-ea88007d4b398b536f7ce9214a64cefff73283c3.zip
samba36: fix segmentation fault when trying to add non-existent users
Based on a patch from НКВД. Closes #12962. Signed-off-by: Jonas Gorski <jogo@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@35610 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--package/network/services/samba36/Makefile2
-rw-r--r--package/network/services/samba36/patches/111-owrt_smbpasswd.patch2
2 files changed, 2 insertions, 2 deletions
diff --git a/package/network/services/samba36/Makefile b/package/network/services/samba36/Makefile
index f71d9092d9..2842c982bf 100644
--- a/package/network/services/samba36/Makefile
+++ b/package/network/services/samba36/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=samba
PKG_VERSION:=3.6.11
-PKG_RELEASE:=1
+PKG_RELEASE:=2
PKG_SOURCE_URL:=http://ftp.samba.org/pub/samba \
http://ftp.samba.org/pub/samba/old-versions
diff --git a/package/network/services/samba36/patches/111-owrt_smbpasswd.patch b/package/network/services/samba36/patches/111-owrt_smbpasswd.patch
index 25a9cb9bf0..7d852c4c61 100644
--- a/package/network/services/samba36/patches/111-owrt_smbpasswd.patch
+++ b/package/network/services/samba36/patches/111-owrt_smbpasswd.patch
@@ -113,7 +113,7 @@
+ }
+
+ if (!find_passwd_line(fp, user, &p1)) {
-+ printf("User %s not found or invalid in /etc/passwd\n");
++ printf("User %s not found or invalid in /etc/passwd\n", user);
+ goto out;
+ }
+