r25035: Fix some more warnings, use service pointer rather than service number in...

[samba.git] / source4 / nbt_server / wins / winsserver.c

diff --git a/source4/nbt_server/wins/winsserver.c b/source4/nbt_server/wins/winsserver.c
index 47d25403864e88dc4287bf25cdd21b096c3b2ff7..fd0188cbf0cd33b44201cc72b1dc71fdb923790e 100644 (file)
--- a/source4/nbt_server/wins/winsserver.c
+++ b/source4/nbt_server/wins/winsserver.c
@@ -615,7 +615,7 @@ static void nbtd_wins_randomize1Clist(const char **addresses, struct socket_addr
        ldb_qsort(addresses, num_addrs , sizeof(addresses[0]),
                  src, (ldb_qsort_cmp_fn_t)nbtd_wins_randomize1Clist_sort);
 
-       mask = lp_parm_string(-1, "nbtd", "wins_randomize1Clist_mask");
+       mask = lp_parm_string(NULL, "nbtd", "wins_randomize1Clist_mask");
        if (!mask) {
                mask = "255.255.255.0";
        }
@@ -691,7 +691,8 @@ static void nbtd_winsserver_query(struct nbt_name_socket *nbtsock,
         * Typ: Daten REG_DWORD
         * Value: 0 = deactivated, 1 = activated
         */
-       if (name->type == NBT_NAME_LOGON && lp_parm_bool(-1, "nbtd", "wins_prepend1Bto1Cqueries", True)) {
+       if (name->type == NBT_NAME_LOGON && 
+           lp_parm_bool(NULL, "nbtd", "wins_prepend1Bto1Cqueries", true)) {
                struct nbt_name name_1b;
 
                name_1b = *name;
@@ -786,7 +787,8 @@ static void nbtd_winsserver_query(struct nbt_name_socket *nbtsock,
         * Typ: Daten REG_DWORD
         * Value: 0 = deactivated, 1 = activated
         */
-       if (name->type == NBT_NAME_LOGON && lp_parm_bool(-1, "nbtd", "wins_randomize1Clist", False)) {
+       if (name->type == NBT_NAME_LOGON && 
+           lp_parm_bool(NULL, "nbtd", "wins_randomize1Clist", false)) {
                nbtd_wins_randomize1Clist(addresses, src);
        }
 
@@ -965,9 +967,9 @@ NTSTATUS nbtd_winsserver_init(struct nbtd_server *nbtsrv)
 
        nbtsrv->winssrv->config.max_renew_interval = lp_max_wins_ttl();
        nbtsrv->winssrv->config.min_renew_interval = lp_min_wins_ttl();
-       tmp = lp_parm_int(-1,"wreplsrv","tombstone_interval", 6*24*60*60);
+       tmp = lp_parm_int(NULL, "wreplsrv", "tombstone_interval", 6*24*60*60);
        nbtsrv->winssrv->config.tombstone_interval = tmp;
-       tmp = lp_parm_int(-1,"wreplsrv","tombstone_timeout", 1*24*60*60);
+       tmp = lp_parm_int(NULL, "wreplsrv"," tombstone_timeout", 1*24*60*60);
        nbtsrv->winssrv->config.tombstone_timeout = tmp;
 
        nbtsrv->winssrv->wins_db     = winsdb_connect(nbtsrv->winssrv, WINSDB_HANDLE_CALLER_NBTD);