diff options
| -rw-r--r-- | configure.ac | 6 | ||||
| -rw-r--r-- | pppd/Makefile.am | 2 | ||||
| -rw-r--r-- | pppd/main.c | 30 | ||||
| -rw-r--r-- | pppd/pppdconf.h.in | 2 |
4 files changed, 20 insertions, 20 deletions
diff --git a/configure.ac b/configure.ac index 988162d..65e2054 100644 --- a/configure.ac +++ b/configure.ac @@ -161,9 +161,9 @@ AS_IF([test "x${build_sunos}" = "xyes" && test "x${enable_multilink}" = "xyes"], # # Multilink require Trivial Database Support -AM_CONDITIONAL(WITH_TDB, test "x${enable_multilink}" = "xyes") -AM_COND_IF([WITH_TDB], - AC_DEFINE([USE_TDB], 1, ["Include TDB support"])) +AM_CONDITIONAL(PPP_WITH_TDB, test "x${enable_multilink}" = "xyes") +AM_COND_IF([PPP_WITH_TDB], + AC_DEFINE([PPP_WITH_TDB], 1, ["Include TDB support"])) # # Enable support for loadable plugins diff --git a/pppd/Makefile.am b/pppd/Makefile.am index 9675208..f06c46d 100644 --- a/pppd/Makefile.am +++ b/pppd/Makefile.am @@ -119,7 +119,7 @@ if PPP_WITH_MULTILINK pppd_SOURCES += multilink.c endif -if WITH_TDB +if PPP_WITH_TDB pppd_SOURCES += tdb.c spinlock.c endif diff --git a/pppd/main.c b/pppd/main.c index e85a09a..dbf22ec 100644 --- a/pppd/main.c +++ b/pppd/main.c @@ -109,7 +109,7 @@ #include "ecp.h" #include "pathnames.h" -#ifdef USE_TDB +#ifdef PPP_WITH_TDB #include "tdb.h" #endif @@ -152,7 +152,7 @@ int ppp_session_number; /* Session number, for channels with such a concept (eg PPPoE) */ int childwait_done; /* have timed out waiting for children */ -#ifdef USE_TDB +#ifdef PPP_WITH_TDB TDB_CONTEXT *pppdb; /* database for storing status etc. */ #endif @@ -246,7 +246,7 @@ static void forget_child(int pid, int status); static int reap_kids(void); static void childwait_end(void *); -#ifdef USE_TDB +#ifdef PPP_WITH_TDB static void update_db_entry(void); static void add_db_key(const char *); static void delete_db_key(const char *); @@ -419,7 +419,7 @@ main(int argc, char *argv[]) */ sys_init(); -#ifdef USE_TDB +#ifdef PPP_WITH_TDB pppdb = tdb_open(_PATH_PPPDB, 0, 0, O_RDWR|O_CREAT, 0644); if (pppdb != NULL) { slprintf(db_key, sizeof(db_key), "pppd%d", getpid()); @@ -1181,7 +1181,7 @@ cleanup(void) (*the_channel->cleanup)(); remove_pidfiles(); -#ifdef USE_TDB +#ifdef PPP_WITH_TDB if (pppdb != NULL) cleanup_db(); #endif @@ -1562,7 +1562,7 @@ safe_fork(int infd, int outfd, int errfd) /* Executing in the child */ sys_close(); -#ifdef USE_TDB +#ifdef PPP_WITH_TDB if (pppdb != NULL) tdb_close(pppdb); #endif @@ -2012,13 +2012,13 @@ script_setenv(char *var, char *value, int iskey) if (script_env != 0) { for (i = 0; (p = script_env[i]) != 0; ++i) { if (strncmp(p, var, varl) == 0 && p[varl] == '=') { -#ifdef USE_TDB +#ifdef PPP_WITH_TDB if (p[-1] && pppdb != NULL) delete_db_key(p); #endif free(p-1); script_env[i] = newstring; -#ifdef USE_TDB +#ifdef PPP_WITH_TDB if (pppdb != NULL) { if (iskey) add_db_key(newstring); @@ -2042,7 +2042,7 @@ script_setenv(char *var, char *value, int iskey) if (!add_script_env(i, newstring)) return; -#ifdef USE_TDB +#ifdef PPP_WITH_TDB if (pppdb != NULL) { if (iskey) add_db_key(newstring); @@ -2066,7 +2066,7 @@ script_unsetenv(char *var) return; for (i = 0; (p = script_env[i]) != 0; ++i) { if (strncmp(p, var, vl) == 0 && p[vl] == '=') { -#ifdef USE_TDB +#ifdef PPP_WITH_TDB if (p[-1] && pppdb != NULL) delete_db_key(p); #endif @@ -2074,7 +2074,7 @@ script_unsetenv(char *var) break; } } -#ifdef USE_TDB +#ifdef PPP_WITH_TDB if (pppdb != NULL) update_db_entry(); #endif @@ -2092,7 +2092,7 @@ script_unsetenv(char *var) */ void lock_db(void) { -#ifdef USE_TDB +#ifdef PPP_WITH_TDB TDB_DATA key; key.dptr = PPPD_LOCK_KEY; @@ -2106,7 +2106,7 @@ void lock_db(void) */ void unlock_db(void) { -#ifdef USE_TDB +#ifdef PPP_WITH_TDB TDB_DATA key; key.dptr = PPPD_LOCK_KEY; @@ -2115,7 +2115,7 @@ void unlock_db(void) #endif } -#ifdef USE_TDB +#ifdef PPP_WITH_TDB /* * update_db_entry - update our entry in the database. */ @@ -2196,4 +2196,4 @@ cleanup_db(void) if (p[-1]) delete_db_key(p); } -#endif /* USE_TDB */ +#endif /* PPP_WITH_TDB */ diff --git a/pppd/pppdconf.h.in b/pppd/pppdconf.h.in index 0a4525d..b607c6c 100644 --- a/pppd/pppdconf.h.in +++ b/pppd/pppdconf.h.in @@ -28,7 +28,7 @@ #undef CBCP_SUPPORT /* "Include Trivial Database support" */ -#undef USE_TDB +#undef PPP_WITH_TDB /* "Have IPv6 support" */ #undef PPP_WITH_IPV6CP |