--- ./pam_encfs.c.orig 2005-12-01 16:54:30 +0300 +++ ./pam_encfs.c 2006-03-25 21:17:31 +0300 @@ -92,7 +92,7 @@ /* --------------------------- PAM functions -------------------------------- */ /* this function ripped from pam_unix/support.c */ -int converse(pam_handle_t * pamh, +static int converse(pam_handle_t * pamh, int nargs, struct pam_message **message, struct pam_response **response) { @@ -114,7 +114,7 @@ /* this function ripped from pam_unix/support.c */ -int _set_auth_tok(pam_handle_t * pamh, int flags, int argc, const char **argv) +static int _set_auth_tok(pam_handle_t * pamh, int flags, int argc, const char **argv) { int retval; char *p; @@ -158,7 +158,7 @@ return PAM_SUCCESS; } -int waitpid_timeout(pid_t pid, int *status, int options) +static int waitpid_timeout(pid_t pid, int *status, int options) { pid_t retval; int i = 0; @@ -176,7 +176,7 @@ } -int checkmnt(const char *targetpath) +static int checkmnt(const char *targetpath) { FILE *f = setmntent("/etc/mtab", "r"); struct mntent *m; @@ -196,7 +196,7 @@ return 0; } -void searchAndReplace(char *line) +static void searchAndReplace(char *line) { char *str; @@ -211,7 +211,7 @@ while (str != NULL); } -int buildCmd(char *arg[], int pos, char *line) +static int buildCmd(char *arg[], int pos, char *line) { int orig_pos = pos; @@ -228,7 +228,7 @@ return pos - orig_pos; } -int readconfig(struct passwd *pwd, pam_handle_t * pamh, const char *user, +static int readconfig(struct passwd *pwd, pam_handle_t * pamh, const char *user, char *path, char *targetpath, char *encfs_options, char *fuse_options) { @@ -236,7 +236,7 @@ char line[BUFSIZE]; char username[USERNAME_MAX]; int parsed; - char *tmp; + const char *tmp; // Return 1 = error, 2 = silent error (ie already mounted)