aboutsummaryrefslogtreecommitdiff
path: root/networking
diff options
context:
space:
mode:
authorDenys Vlasenko <vda.linux@googlemail.com>2012-04-20 14:48:00 +0200
committerDenys Vlasenko <vda.linux@googlemail.com>2012-04-20 14:48:00 +0200
commit8cab66730aa59c121eb98b20f4ae7ddda1c3ecf6 (patch)
treec85481105e66d3d7f2b0bf712028fb5f02138215 /networking
parentb110e1fecb4398524e857d772c5cc635615b0ac4 (diff)
downloadbusybox-w32-8cab66730aa59c121eb98b20f4ae7ddda1c3ecf6.tar.gz
busybox-w32-8cab66730aa59c121eb98b20f4ae7ddda1c3ecf6.tar.bz2
busybox-w32-8cab66730aa59c121eb98b20f4ae7ddda1c3ecf6.zip
fix build breakage found by randconfig
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'networking')
-rw-r--r--networking/httpd.c4
-rw-r--r--networking/udhcp/d6_common.h4
-rw-r--r--networking/udhcp/d6_dhcpc.c2
3 files changed, 8 insertions, 2 deletions
diff --git a/networking/httpd.c b/networking/httpd.c
index fb6ecbf70..12218a0a3 100644
--- a/networking/httpd.c
+++ b/networking/httpd.c
@@ -1676,7 +1676,7 @@ static int checkPermIP(void)
1676 1676
1677#if ENABLE_FEATURE_HTTPD_BASIC_AUTH 1677#if ENABLE_FEATURE_HTTPD_BASIC_AUTH
1678 1678
1679# if ENABLE_FEATURE_HTTPD_AUTH_MD5 && ENABLE_PAM 1679# if ENABLE_PAM
1680struct pam_userinfo { 1680struct pam_userinfo {
1681 const char *name; 1681 const char *name;
1682 const char *pw; 1682 const char *pw;
@@ -1842,7 +1842,9 @@ static int check_user_passwd(const char *path, char *user_and_passwd)
1842 1842
1843 if (passwd[0] == '$' && isdigit(passwd[1])) { 1843 if (passwd[0] == '$' && isdigit(passwd[1])) {
1844 char *encrypted; 1844 char *encrypted;
1845# if !ENABLE_PAM
1845 check_encrypted: 1846 check_encrypted:
1847# endif
1846 /* encrypt pwd from peer and check match with local one */ 1848 /* encrypt pwd from peer and check match with local one */
1847 encrypted = pw_encrypt( 1849 encrypted = pw_encrypt(
1848 /* pwd (from peer): */ colon_after_user + 1, 1850 /* pwd (from peer): */ colon_after_user + 1,
diff --git a/networking/udhcp/d6_common.h b/networking/udhcp/d6_common.h
index 4dd7e621e..eb211ea0f 100644
--- a/networking/udhcp/d6_common.h
+++ b/networking/udhcp/d6_common.h
@@ -115,7 +115,11 @@ int FAST_FUNC d6_send_kernel_packet(
115 struct in6_addr *dst_ipv6, int dest_port 115 struct in6_addr *dst_ipv6, int dest_port
116); 116);
117 117
118#if defined CONFIG_UDHCP_DEBUG && CONFIG_UDHCP_DEBUG >= 2
118void FAST_FUNC d6_dump_packet(struct d6_packet *packet); 119void FAST_FUNC d6_dump_packet(struct d6_packet *packet);
120#else
121# define d6_dump_packet(packet) ((void)0)
122#endif
119 123
120 124
121POP_SAVED_FUNCTION_VISIBILITY 125POP_SAVED_FUNCTION_VISIBILITY
diff --git a/networking/udhcp/d6_dhcpc.c b/networking/udhcp/d6_dhcpc.c
index 23e6862dc..a792a9dca 100644
--- a/networking/udhcp/d6_dhcpc.c
+++ b/networking/udhcp/d6_dhcpc.c
@@ -19,7 +19,7 @@
19 19
20//applet:IF_UDHCPC6(APPLET(udhcpc6, BB_DIR_USR_BIN, BB_SUID_DROP)) 20//applet:IF_UDHCPC6(APPLET(udhcpc6, BB_DIR_USR_BIN, BB_SUID_DROP))
21 21
22//kbuild:lib-$(CONFIG_UDHCPC6) += d6_dhcpc.o d6_packet.o d6_socket.o common.o 22//kbuild:lib-$(CONFIG_UDHCPC6) += d6_dhcpc.o d6_packet.o d6_socket.o common.o socket.o signalpipe.o
23 23
24 24
25#include <syslog.h> 25#include <syslog.h>