diff options
| author | Denys Vlasenko <vda.linux@googlemail.com> | 2012-04-20 14:48:00 +0200 |
|---|---|---|
| committer | Denys Vlasenko <vda.linux@googlemail.com> | 2012-04-20 14:48:00 +0200 |
| commit | 8cab66730aa59c121eb98b20f4ae7ddda1c3ecf6 (patch) | |
| tree | c85481105e66d3d7f2b0bf712028fb5f02138215 /networking | |
| parent | b110e1fecb4398524e857d772c5cc635615b0ac4 (diff) | |
| download | busybox-8cab66730aa59c121eb98b20f4ae7ddda1c3ecf6.tar.gz | |
fix build breakage found by randconfig
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'networking')
| -rw-r--r-- | networking/httpd.c | 4 | ||||
| -rw-r--r-- | networking/udhcp/d6_common.h | 4 | ||||
| -rw-r--r-- | networking/udhcp/d6_dhcpc.c | 2 |
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) #if ENABLE_FEATURE_HTTPD_BASIC_AUTH -# if ENABLE_FEATURE_HTTPD_AUTH_MD5 && ENABLE_PAM +# if ENABLE_PAM struct pam_userinfo { const char *name; const char *pw; @@ -1842,7 +1842,9 @@ static int check_user_passwd(const char *path, char *user_and_passwd) if (passwd[0] == '$' && isdigit(passwd[1])) { char *encrypted; +# if !ENABLE_PAM check_encrypted: +# endif /* encrypt pwd from peer and check match with local one */ encrypted = pw_encrypt( /* 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( struct in6_addr *dst_ipv6, int dest_port ); +#if defined CONFIG_UDHCP_DEBUG && CONFIG_UDHCP_DEBUG >= 2 void FAST_FUNC d6_dump_packet(struct d6_packet *packet); +#else +# define d6_dump_packet(packet) ((void)0) +#endif POP_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 @@ //applet:IF_UDHCPC6(APPLET(udhcpc6, BB_DIR_USR_BIN, BB_SUID_DROP)) -//kbuild:lib-$(CONFIG_UDHCPC6) += d6_dhcpc.o d6_packet.o d6_socket.o common.o +//kbuild:lib-$(CONFIG_UDHCPC6) += d6_dhcpc.o d6_packet.o d6_socket.o common.o socket.o signalpipe.o #include <syslog.h> |