Basic patch for android cross-compilation.

[tinc] / src / tincd.c

diff --git a/src/tincd.c b/src/tincd.c
index 443301e..7b74cd6 100644 (file)
--- a/src/tincd.c
+++ b/src/tincd.c
@@ -337,16 +337,9 @@ static void indicator(int a, int b, void *p) {
 static bool keygen(int bits) {
        RSA *rsa_key;
        FILE *f;
-       char *name = NULL;
+       char *name = get_name();
        char *filename;
 
-       get_config_string(lookup_config(config_tree, "Name"), &name);
-
-       if(name && !check_id(name)) {
-               fprintf(stderr, "Invalid name for myself!\n");
-               return false;
-       }
-
        fprintf(stderr, "Generating %d bits keys:\n", bits);
        rsa_key = RSA_generate_key(bits, 0x10001, indicator, NULL);
 
@@ -386,8 +379,7 @@ static bool keygen(int bits) {
        PEM_write_RSAPublicKey(f, rsa_key);
        fclose(f);
        free(filename);
-       if(name)
-               free(name);
+       free(name);
 
        return true;
 }
@@ -475,8 +467,9 @@ static bool drop_privs() {
                               "initgroups", strerror(errno));
                        return false;
                }
-               endgrent();
-               endpwent();
+        // Not supported in android NDK
+               //endgrent();
+               //endpwent();
        }
        if (do_chroot) {
                tzset();        /* for proper timestamps in logs */
@@ -539,6 +532,12 @@ int main(int argc, char **argv) {
 
        g_argv = argv;
 
+       if(getenv("LISTEN_PID") && atoi(getenv("LISTEN_PID")) == getpid())
+               do_detach = false;
+#ifdef HAVE_UNSETENV
+       unsetenv("LISTEN_PID");
+#endif
+
        init_configuration(&config_tree);
 
        /* Slllluuuuuuurrrrp! */