Thread safety: Store the name of conf file in radius_conf_t.

I needed to move the position of the structures
so I could use the CONST macro with the new
member.

1 files changed, 36 insertions, 34 deletions

diff --git a/src/pam_radius_auth.h b/src/pam_radius_auth.h
index defec5c..0882c53 100644
--- a/src/pam_radius_auth.h
+++ b/src/pam_radius_auth.h
@@ -47,40 +47,6 @@
 #define MAXPROMPT 33               /* max prompt length, including '\0' */
 #define DEFAULT_PROMPT "Password"  /* default prompt, without the ': '  */
 
-/*************************************************************************
- * Additional RADIUS definitions
- *************************************************************************/
-
-/* Per-attribute structure */
-typedef struct attribute_t {
-	unsigned char attribute;
-	unsigned char length;
-	unsigned char data[1];
-} attribute_t;
-
-typedef struct radius_server_t {
-	struct radius_server_t *next;
-	struct in_addr ip;
-	uint16_t port;
-	char *hostname;
-	char *secret;
-	int timeout;
-	int accounting;
-} radius_server_t;
-
-typedef struct radius_conf_t {
-	radius_server_t *server;
-	int retries;
-	int localifdown;
-	char *client_id;
-	int accounting_bug;
-	int force_prompt;
-	int max_challenge;
-	int sockfd;
-	int debug;
-	char prompt[MAXPROMPT];
-} radius_conf_t;
-
 
 /*************************************************************************
  * Platform specific defines
@@ -146,4 +112,40 @@ typedef struct radius_conf_t {
 #define TRUE !FALSE
 #endif
 
+
+/*************************************************************************
+ * Additional RADIUS definitions
+ *************************************************************************/
+
+/* Per-attribute structure */
+typedef struct attribute_t {
+	unsigned char attribute;
+	unsigned char length;
+	unsigned char data[1];
+} attribute_t;
+
+typedef struct radius_server_t {
+	struct radius_server_t *next;
+	struct in_addr ip;
+	uint16_t port;
+	char *hostname;
+	char *secret;
+	int timeout;
+	int accounting;
+} radius_server_t;
+
+typedef struct radius_conf_t {
+	radius_server_t *server;
+	int retries;
+	int localifdown;
+	char *client_id;
+	int accounting_bug;
+	int force_prompt;
+	int max_challenge;
+	int sockfd;
+	int debug;
+	CONST char *conf_file;
+	char prompt[MAXPROMPT];
+} radius_conf_t;
+
 #endif /* PAM_RADIUS_H */