Changeset 7351

Timestamp:

08/12/11 01:21:06 (22 months ago)

Author:

jow

Message:

libs/nixio: allow building without shadow password support

Location:

luci/trunk/libs/nixio

Files:

• Makefile (modified) (2 diffs)
• src/user.c (modified) (4 diffs)

luci/trunk/libs/nixio/Makefile

@@ -11 +11 @@
 AXTLS_FILE    = $(AXTLS_DIR)-$(AXTLS_VERSION).tar.gz
 NIXIO_TLS    ?= openssl
+NIXIO_SHADOW ?= $(shell echo 'int main(void){ return !getspnam("root"); }' | $(CC) -include shadow.h -xc -o/dev/null - 2>/dev/null && echo yes)
 NIXIO_SO      = nixio.so
 NIXIO_LDFLAGS =
@@ -44 +45 @@
 ifeq ($(NIXIO_TLS),)
     NIXIO_CFLAGS += -DNO_TLS
+endif
+
+ifneq ($(NIXIO_SHADOW),yes)
+    NIXIO_CFLAGS += -DNO_SHADOW
 endif
 

luci/trunk/libs/nixio/src/user.c

@@ -29 +29 @@
 
 #ifndef BSD
+#ifndef NO_SHADOW
 #include <shadow.h>
+#endif
 #include <crypt.h>
 #endif
@@ -163 +165 @@
 
 #ifndef BSD
+#ifndef NO_SHADOW
 static int nixio__push_spwd(lua_State *L, struct spwd *sp) {
     lua_createtable(L, 0, 9);
@@ -217 +220 @@
     }
 }
+#endif /* !NO_SHADOW */
 #endif /* !BSD */
 
@@ -240 +244 @@
     {"getpw",       nixio_getpw},
 #ifndef BSD
+#ifndef NO_SHADOW
     {"getsp",       nixio_getsp},
+#endif
 #endif
     {NULL,          NULL}