WARNING! MOVED rpc_server/srv_lsa_hnd.c TO lib/util_hnd.c

CVS UPDATE MAY ISSUE WARNING ABOUT lib/util_hnd.c MODIFICATION
DATE BEING IN THE FUTURE.  CVS CHECKOUT A NEW REPOSITORY MAY BE
SAFER.

diff --git a/source/Makefile.in b/source/Makefile.in
index f39bd513412f823ed0e029bed4aa7437a7f37155..1f481f6599e89da25822468e91b7fe33313c8c66 100644 (file)
--- a/source/Makefile.in
+++ b/source/Makefile.in
@@ -112,7 +112,8 @@ LIB_OBJ = lib/charcnv.o lib/charset.o lib/debug.o lib/fault.o \
                lib/util_str.o lib/util_unistr.o \
                lib/util_file.o mem_man/mem_man.o \
                lib/util_sock.o lib/unix_sec_ctxt.o \
-               lib/util_array.o
+               lib/util_array.o \
+               lib/util_hnd.o
 
 UBIQX_OBJ = ubiqx/ubi_BinTree.o ubiqx/ubi_Cache.o ubiqx/ubi_SplayTree.o \
             ubiqx/ubi_dLinkList.o ubiqx/ubi_sLinkList.o
@@ -126,7 +127,6 @@ LIBSMB_OBJ = libsmb/clientgen.o libsmb/namequery.o libsmb/nmblib.o \
 
 RPC_SERVER_OBJ = \
                rpc_server/srv_lsa.o \
-               rpc_server/srv_lsa_hnd.o \
                rpc_server/srv_netlog.o \
                rpc_server/srv_pipe_hnd.o \
                rpc_server/srv_reg.o \

diff --git a/source/include/proto.h b/source/include/proto.h
index 2307f67cef86b4470aca7c6a2f232d69b58f53f8..be4183b4fc3dd2b0e1789db499d987d7e6b830d0 100644 (file)
--- a/source/include/proto.h
+++ b/source/include/proto.h
@@ -526,6 +526,23 @@ char *fgets_slash(char *s2,int maxlen,FILE *f);
 BOOL file_modified(const char *filename, time_t *lastmodified);
 void *open_file_if_modified(const char *filename, char *mode, time_t *lastmodified);
 
+/*The following definitions come from  lib/util_hnd.c  */
+
+BOOL init_policy_hnd(int num_pol_hnds);
+BOOL open_policy_hnd(POLICY_HND *hnd);
+int find_policy_by_hnd(POLICY_HND *hnd);
+BOOL set_policy_samr_rid(POLICY_HND *hnd, uint32 rid);
+BOOL set_policy_samr_pol_status(POLICY_HND *hnd, uint32 pol_status);
+BOOL set_policy_samr_sid(POLICY_HND *hnd, DOM_SID *sid);
+BOOL get_policy_samr_sid(POLICY_HND *hnd, DOM_SID *sid);
+uint32 get_policy_samr_rid(POLICY_HND *hnd);
+BOOL set_policy_reg_name(POLICY_HND *hnd, fstring name);
+BOOL get_policy_reg_name(POLICY_HND *hnd, fstring name);
+BOOL set_policy_cli_state(POLICY_HND *hnd, struct cli_state *cli, uint16 fnum,
+                               void (*free_fn)(struct cli_state *, uint16));
+BOOL get_policy_cli_state(POLICY_HND *hnd, struct cli_state **cli, uint16 *fnum);
+BOOL close_policy_hnd(POLICY_HND *hnd);
+
 /*The following definitions come from  lib/util_pwdb.c  */
 
 uint32 lookup_wk_group_name(const char *group_name, const char *domain,
@@ -3500,23 +3517,6 @@ uint32 lookup_name(char *name, DOM_SID *sid, uint8 *type);
 
 BOOL api_ntlsa_rpc(pipes_struct *p, prs_struct *data);
 
-/*The following definitions come from  rpc_server/srv_lsa_hnd.c  */
-
-void init_policy_hnd(int num_pol_hnds);
-BOOL open_policy_hnd(POLICY_HND *hnd);
-int find_policy_by_hnd(POLICY_HND *hnd);
-BOOL set_policy_samr_rid(POLICY_HND *hnd, uint32 rid);
-BOOL set_policy_samr_pol_status(POLICY_HND *hnd, uint32 pol_status);
-BOOL set_policy_samr_sid(POLICY_HND *hnd, DOM_SID *sid);
-BOOL get_policy_samr_sid(POLICY_HND *hnd, DOM_SID *sid);
-uint32 get_policy_samr_rid(POLICY_HND *hnd);
-BOOL set_policy_reg_name(POLICY_HND *hnd, fstring name);
-BOOL get_policy_reg_name(POLICY_HND *hnd, fstring name);
-BOOL set_policy_cli_state(POLICY_HND *hnd, struct cli_state *cli, uint16 fnum,
-                               void (*free_fn)(struct cli_state *, uint16));
-BOOL get_policy_cli_state(POLICY_HND *hnd, struct cli_state **cli, uint16 *fnum);
-BOOL close_policy_hnd(POLICY_HND *hnd);
-
 /*The following definitions come from  rpc_server/srv_netlog.c  */
 
 BOOL api_netlog_rpc(pipes_struct *p, prs_struct *data);

diff --git a/source/lib/util_hnd.c b/source/lib/util_hnd.c
index 7a144374822f1872751ebbc89200bf9fce6436c7..36bacad59ba6b7d8b8e29fa291bfd2ec58b89a1c 100644 (file)
--- a/source/lib/util_hnd.c
+++ b/source/lib/util_hnd.c
@@ -101,12 +101,11 @@ static void create_pol_hnd(POLICY_HND *hnd)
 /****************************************************************************
   initialise policy handle states...
 ****************************************************************************/
-void init_policy_hnd(int num_pol_hnds)
+BOOL init_policy_hnd(int num_pol_hnds)
 {
        bmap = bitmap_allocate(num_pol_hnds);
-       if (!bmap) {
-               exit_server("out of memory in init_policy_hnd\n");
-       }
+       
+       return bmap != NULL;
 }
 
 /****************************************************************************

diff --git a/source/rpc_server/srv_lsa_hnd.c b/source/rpc_server/srv_lsa_hnd.c
index 7a144374822f1872751ebbc89200bf9fce6436c7..36bacad59ba6b7d8b8e29fa291bfd2ec58b89a1c 100644 (file)
--- a/source/rpc_server/srv_lsa_hnd.c
+++ b/source/rpc_server/srv_lsa_hnd.c
@@ -101,12 +101,11 @@ static void create_pol_hnd(POLICY_HND *hnd)
 /****************************************************************************
   initialise policy handle states...
 ****************************************************************************/
-void init_policy_hnd(int num_pol_hnds)
+BOOL init_policy_hnd(int num_pol_hnds)
 {
        bmap = bitmap_allocate(num_pol_hnds);
-       if (!bmap) {
-               exit_server("out of memory in init_policy_hnd\n");
-       }
+       
+       return bmap != NULL;
 }
 
 /****************************************************************************

diff --git a/source/smbd/server.c b/source/smbd/server.c
index c2162a091b345eb25d7e294892b91ba8fe64c670..a0c9ab7c5656dd2fc85365732c94491fd13c26fb 100644 (file)
--- a/source/smbd/server.c
+++ b/source/smbd/server.c
@@ -476,7 +476,10 @@ static void init_structs(void)
        conn_init();
        file_init();
        init_rpc_pipe_hnd(); /* for RPC pipes */
-       init_policy_hnd(MAX_SERVER_POLICY_HANDLES); /* for policy handles */
+       if (!init_policy_hnd(MAX_SERVER_POLICY_HANDLES)) 
+       {
+               exit_server("could not allocate policy handles\n");
+       }
        init_printer_hnd(); /* for SPOOLSS handles */
        init_dptrs();
        init_dfs_table();