port latest changes from SAMBA_3_0 tree

[kamenim/samba.git] / source3 / nsswitch / winbindd.h

diff --git a/source3/nsswitch/winbindd.h b/source3/nsswitch/winbindd.h
index d98ac28ab14036f887009932f48ac21ea426c4a0..677afa1849f2f571627fec91a6c37f9de98dd2a1 100644 (file)
--- a/source3/nsswitch/winbindd.h
+++ b/source3/nsswitch/winbindd.h
@@ -4,7 +4,7 @@
    Winbind daemon for ntdom nss module
 
    Copyright (C) Tim Potter 2000
-   Copyright (C) Anthony Liguori 2003
+   Copyright (C) Jim McDonough <jmcd@us.ibm.com> 2003
    
    This library is free software; you can redistribute it and/or
    modify it under the terms of the GNU Library General Public
@@ -43,7 +43,7 @@ struct winbindd_cli_state {
        BOOL finished;                            /* Can delete from list */
        BOOL write_extra_data;                    /* Write extra_data field */
        time_t last_access;                       /* Time of last access (read or write) */
-       BOOL privilaged;                           /* Is the client 'privilaged' */
+       BOOL privileged;                           /* Is the client 'privileged' */
 
        struct winbindd_request request;          /* Request from client */
        struct winbindd_response response;        /* Respose to client */
@@ -98,9 +98,12 @@ struct winbindd_domain {
        BOOL native_mode;                      /* is this a win2k domain in native mode ? */
 
        /* Lookup methods for this domain (LDAP or RPC) */
-
        struct winbindd_methods *methods;
 
+       /* the backend methods are used by the cache layer to find the right
+          backend */
+       struct winbindd_methods *backend;
+
         /* Private data for the backends (used for connection cache) */
 
        void *private; 
@@ -109,6 +112,7 @@ struct winbindd_domain {
 
        time_t last_seq_check;
        uint32 sequence_number;
+       NTSTATUS last_status;
 
        /* Linked list info */
 
@@ -203,7 +207,7 @@ typedef struct {
 } CLI_POLICY_HND;
 
 /* Filled out by IDMAP backends */
-struct idmap_methods {
+struct winbindd_idmap_methods {
   /* Called when backend is first loaded */
   BOOL (*init)(void);
 
@@ -219,7 +223,7 @@ struct idmap_methods {
   void (*status)(void);
 };
 
-#include "winbindd_proto.h"
+#include "../nsswitch/winbindd_proto.h"
 
 #include "rpc_parse.h"
 #include "rpc_client.h"