From 69e41084b94ea90a70d507e570ca71eb82353ecb Mon Sep 17 00:00:00 2001
From: Tim Potter <tpot@samba.org>
Date: Mon, 7 Apr 2003 06:43:16 +0000
Subject: privilaged -> privileged

(This changes the location of the winbindd privileged pipe)
(This used to be commit f111f10076c7797e5fd39edcc0aad7d860bb5ac5)
---
 source3/nsswitch/winbindd.c      | 8 ++++----
 source3/nsswitch/winbindd.h      | 2 +-
 source3/nsswitch/winbindd_misc.c | 2 +-
 source3/nsswitch/winbindd_nss.h  | 4 ++--
 source3/nsswitch/winbindd_pam.c  | 4 ++--
 5 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'source3')

diff --git a/source3/nsswitch/winbindd.c b/source3/nsswitch/winbindd.c
index 5cdddb6222..c096ca9b0f 100644
--- a/source3/nsswitch/winbindd.c
+++ b/source3/nsswitch/winbindd.c
@@ -287,7 +287,7 @@ static void process_request(struct winbindd_cli_state *state)
 
 /* Process a new connection by adding it to the client connection list */
 
-static void new_connection(int listen_sock, BOOL privilaged)
+static void new_connection(int listen_sock, BOOL privileged)
 {
 	struct sockaddr_un sunaddr;
 	struct winbindd_cli_state *state;
@@ -318,7 +318,7 @@ static void new_connection(int listen_sock, BOOL privilaged)
 
 	state->last_access = time(NULL);	
 
-	state->privilaged = privilaged;
+	state->privileged = privileged;
 
 	/* Add to connection list */
 	
@@ -639,7 +639,7 @@ static void process_loop(void)
 						break;
 					}
 				}
-				/* new, non-privilaged connection */
+				/* new, non-privileged connection */
 				new_connection(listen_sock, False);
 			}
             
@@ -653,7 +653,7 @@ static void process_loop(void)
 						break;
 					}
 				}
-				/* new, privilaged connection */
+				/* new, privileged connection */
 				new_connection(listen_priv_sock, True);
 			}
             
diff --git a/source3/nsswitch/winbindd.h b/source3/nsswitch/winbindd.h
index 192b058871..2d9a0b5949 100644
--- a/source3/nsswitch/winbindd.h
+++ b/source3/nsswitch/winbindd.h
@@ -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 */
diff --git a/source3/nsswitch/winbindd_misc.c b/source3/nsswitch/winbindd_misc.c
index 3b44d029c0..52889e85d4 100644
--- a/source3/nsswitch/winbindd_misc.c
+++ b/source3/nsswitch/winbindd_misc.c
@@ -239,7 +239,7 @@ enum winbindd_result winbindd_netbios_name(struct winbindd_cli_state *state)
 enum winbindd_result winbindd_priv_pipe_dir(struct winbindd_cli_state *state)
 {
 
-	DEBUG(3, ("[%5d]: request location of privilaged pipe\n", state->pid));
+	DEBUG(3, ("[%5d]: request location of privileged pipe\n", state->pid));
 	
 	state->response.extra_data = strdup(get_winbind_priv_pipe_dir());
 	if (!state->response.extra_data)
diff --git a/source3/nsswitch/winbindd_nss.h b/source3/nsswitch/winbindd_nss.h
index 88f4a11f87..cc1b144063 100644
--- a/source3/nsswitch/winbindd_nss.h
+++ b/source3/nsswitch/winbindd_nss.h
@@ -30,7 +30,7 @@
 
 #define WINBINDD_SOCKET_NAME "pipe"            /* Name of PF_UNIX socket */
 #define WINBINDD_SOCKET_DIR  "/tmp/.winbindd"  /* Name of PF_UNIX dir */
-#define WINBINDD_PRIV_SOCKET_SUBDIR "winbindd_privilaged" /* name of subdirectory of lp_lockdir() to hold the 'privilaged' pipe */
+#define WINBINDD_PRIV_SOCKET_SUBDIR "winbindd_privileged" /* name of subdirectory of lp_lockdir() to hold the 'privileged' pipe */
 #define WINBINDD_DOMAIN_ENV  "WINBINDD_DOMAIN" /* Environment variables */
 #define WINBINDD_DONT_ENV    "_NO_WINBINDD"
 
@@ -105,7 +105,7 @@ enum winbindd_cmd {
 	WINBINDD_NETBIOS_NAME,       /* The netbios name of the server */
 	/* Placeholder for end of cmd list */
 
-	/* find the location of our privilaged pipe */
+	/* find the location of our privileged pipe */
 	WINBINDD_PRIV_PIPE_DIR,
 
 	WINBINDD_NUM_CMDS
diff --git a/source3/nsswitch/winbindd_pam.c b/source3/nsswitch/winbindd_pam.c
index e65d2bb0f6..e49a95f4b8 100644
--- a/source3/nsswitch/winbindd_pam.c
+++ b/source3/nsswitch/winbindd_pam.c
@@ -179,8 +179,8 @@ enum winbindd_result winbindd_pam_auth_crap(struct winbindd_cli_state *state)
 
 	DATA_BLOB lm_resp, nt_resp;
 
-	if (!state->privilaged) {
-		DEBUG(2, ("winbindd_pam_auth_crap: non-privilaged access denied!\n"));
+	if (!state->privileged) {
+		DEBUG(2, ("winbindd_pam_auth_crap: non-privileged access denied!\n"));
 		/* send a better message than ACCESS_DENIED */
 		push_utf8_fstring(state->response.data.auth.error_string, "winbind client not authorized to use winbindd_pam_auth_crap");
 		result =  NT_STATUS_ACCESS_DENIED;
-- 
cgit