Libinfo-89.1.tar.gz

diff --git a/netinfo.subproj/ni_glue.c b/netinfo.subproj/ni_glue.c
index 751cd9306a9d0cfb02a33bcd75d971e0bbeb24ba..b6129bc42e61b88b3092fdb63e0605b85ac4c887 100644 (file)
--- a/netinfo.subproj/ni_glue.c
+++ b/netinfo.subproj/ni_glue.c
@@ -722,6 +722,7 @@ setmaster(
                ni->needwrite = needwrite;
                return (0);
        }
                ni->needwrite = needwrite;
                return (0);
        }

+       NI_INIT(&nl);

        if (ni_lookupprop(ni, &root, NAME_MASTER, &nl) != NI_OK) {
                ni->needwrite = needwrite;
                return (0);
        if (ni_lookupprop(ni, &root, NAME_MASTER, &nl) != NI_OK) {
                ni->needwrite = needwrite;
                return (0);


@@ -737,6 +738,7 @@ setmaster(
        }
        *sep++ = 0;
        master = nl.ninl_val[0];
        }
        *sep++ = 0;
        master = nl.ninl_val[0];

+       NI_INIT(&idl);

        if (ni_lookup(ni, &root, NAME_NAME, NAME_MACHINES, &idl) != NI_OK) {
                ni->needwrite = needwrite;
                ni_namelist_free(&nl);
        if (ni_lookup(ni, &root, NAME_NAME, NAME_MACHINES, &idl) != NI_OK) {
                ni->needwrite = needwrite;
                ni_namelist_free(&nl);


@@ -748,6 +750,7 @@ setmaster(
        }
        id.nii_object = idl.niil_val[0];
        ni_idlist_free(&idl);
        }
        id.nii_object = idl.niil_val[0];
        ni_idlist_free(&idl);

+       NI_INIT(&idl);

        if (ni_lookup(ni, &id, NAME_NAME, master, &idl) != NI_OK) {
                ni_namelist_free(&nl);
                ni->needwrite = needwrite;
        if (ni_lookup(ni, &id, NAME_NAME, master, &idl) != NI_OK) {
                ni_namelist_free(&nl);
                ni->needwrite = needwrite;


@@ -760,6 +763,7 @@ setmaster(
        }
        id.nii_object = idl.niil_val[0];
        ni_idlist_free(&idl);
        }
        id.nii_object = idl.niil_val[0];
        ni_idlist_free(&idl);

+       NI_INIT(&nl);

        if (ni_lookupprop(ni, &id, NAME_IP_ADDRESS, &nl) != NI_OK) {
                return (0);
        }
        if (ni_lookupprop(ni, &id, NAME_IP_ADDRESS, &nl) != NI_OK) {
                return (0);
        }


@@ -1026,6 +1030,7 @@ addaddr(
        int i;
 
        id.nii_object = ido;
        int i;
 
        id.nii_object = ido;

+       NI_INIT(&nl);

        if (ni_lookupprop(ni, &id, NAME_IP_ADDRESS, &nl) != NI_OK) {
                return (0);
        }
        if (ni_lookupprop(ni, &id, NAME_IP_ADDRESS, &nl) != NI_OK) {
                return (0);
        }


@@ -1078,6 +1083,7 @@ get_daddr(
                return(0);
        }
 
                return(0);
        }
 

+       NI_INIT(&ids);

        if (ni_lookup(ni, &id, NAME_NAME, NAME_MACHINES, &ids) != NI_OK) {
                return (0);
        }
        if (ni_lookup(ni, &id, NAME_NAME, NAME_MACHINES, &ids) != NI_OK) {
                return (0);
        }


@@ -1085,6 +1091,7 @@ get_daddr(
        id.nii_object = ids.niil_val[0];
        ni_idlist_free(&ids);
 
        id.nii_object = ids.niil_val[0];
        ni_idlist_free(&ids);
 

+       NI_INIT(&entries);

        if (ni_list(ni, &id, NAME_SERVES, &entries) != NI_OK) {
                return (0);
        }
        if (ni_list(ni, &id, NAME_SERVES, &entries) != NI_OK) {
                return (0);
        }


@@ -1127,12 +1134,14 @@ get_haddr(
        if (ni_root(ni, &id) != NI_OK) {
                return(0);
        }
        if (ni_root(ni, &id) != NI_OK) {
                return(0);
        }

+       NI_INIT(&ids);

        if (ni_lookup(ni, &id, NAME_NAME, NAME_MACHINES, &ids) != NI_OK) {
                return (0);
        }
        id.nii_object = ids.niil_val[0];
        ni_idlist_free(&ids);
 
        if (ni_lookup(ni, &id, NAME_NAME, NAME_MACHINES, &ids) != NI_OK) {
                return (0);
        }
        id.nii_object = ids.niil_val[0];
        ni_idlist_free(&ids);
 

+       NI_INIT(&ids);

        if (ni_lookup(ni, &id, NAME_NAME, hname, &ids) != NI_OK) {
                return (0);
        }
        if (ni_lookup(ni, &id, NAME_NAME, hname, &ids) != NI_OK) {
                return (0);
        }


@@ -1981,17 +1990,20 @@ ni_setuser(
        if (ni_root(ni, &id) != NI_OK) {
                return(NI_NOUSER);
        }
        if (ni_root(ni, &id) != NI_OK) {
                return(NI_NOUSER);
        }

+       NI_INIT(&ids);

        if (ni_lookup(ni, &id, NAME_NAME, NAME_USERS, &ids) != NI_OK) {
                return (NI_NOUSER);
        }
        id.nii_object = ids.niil_val[0];
        ni_idlist_free(&ids);
 
        if (ni_lookup(ni, &id, NAME_NAME, NAME_USERS, &ids) != NI_OK) {
                return (NI_NOUSER);
        }
        id.nii_object = ids.niil_val[0];
        ni_idlist_free(&ids);
 

+       NI_INIT(&ids);

        if (ni_lookup(ni, &id, NAME_NAME, user, &ids) != NI_OK) {
                return (NI_NOUSER);
        }
        id.nii_object = ids.niil_val[0];
        ni_idlist_free(&ids);
        if (ni_lookup(ni, &id, NAME_NAME, user, &ids) != NI_OK) {
                return (NI_NOUSER);
        }
        id.nii_object = ids.niil_val[0];
        ni_idlist_free(&ids);

+       NI_INIT(&nl);

        if (ni_lookupprop(ni, &id, NAME_UID, &nl) != NI_OK) {
                return (NI_NOUSER);
        }
        if (ni_lookupprop(ni, &id, NAME_UID, &nl) != NI_OK) {
                return (NI_NOUSER);
        }

diff --git a/netinfo.subproj/ni_useful.c b/netinfo.subproj/ni_useful.c
index eaed642e6e17a9ede396a3499e7ecbc80bc5963f..93645842c6a7b47fbb661b57cc996bac94d7d778 100644 (file)
--- a/netinfo.subproj/ni_useful.c
+++ b/netinfo.subproj/ni_useful.c
@@ -262,6 +262,7 @@ ni_relsearch(
        }
        unescape(&key);
        unescape(&val);
        }
        unescape(&key);
        unescape(&val);

+       NI_INIT(&idl);

        status = ni_lookup(ni, id, key, val, &idl);
        if (status != NI_OK) {
                ni_name_free(&key);
        status = ni_lookup(ni, id, key, val, &idl);
        if (status != NI_OK) {
                ni_name_free(&key);