newcamd: Do not use crypt_r() because it breaks OS X compilation.

Makefile

@@ -45,9 +45,13 @@ tsdecrypt_SRC = data.c \
  tables.c \
  notify.c \
  tsdecrypt.c
-tsdecrypt_LIBS = -lcrypt -lcrypto -ldvbcsa -lpthread
+tsdecrypt_LIBS = -lcrypto -ldvbcsa -lpthread
 tsdecrypt_OBJS = $(FUNCS_LIB) $(TS_LIB) $(tsdecrypt_SRC:.c=.o)
 
+ifeq "$(shell uname -s)" "Linux"
+tsdecrypt_LIBS += -lcrypt
+endif
+
 CLEAN_OBJS = tsdecrypt $(tsdecrypt_SRC:.c=.{o,d})
 
 PROGS = tsdecrypt

camd-newcamd.c

@@ -17,12 +17,10 @@
  */
 
 #define _XOPEN_SOURCE 700 // Needed to pull crypt() from unistd.h
-#define _GNU_SOURCE 1 // Needed to pull crypt_r() from crypt.h
 
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
-#include <crypt.h>
 
 #include <openssl/des.h>
 
@@ -296,9 +294,7 @@ static int newcamd_login(struct camd *c) {
 		return 0;
 	}
 
-	struct crypt_data crypt_data;
-	crypt_data.initialized = 0;
-	char *crPasswd = crypt_r(c->pass, "$1$abcdefgh$", &crypt_data);
+	char *crPasswd = crypt(c->pass, "$1$abcdefgh$");
 
 	const int userLen = strlen(c->user) + 1;
 	const int passLen = strlen(crPasswd) + 1;