diff options
| author | Seth Nickell <seth@eazel.com> | 2000-09-12 02:54:07 +0000 |
|---|---|---|
| committer | Seth Nickell <seth@src.gnome.org> | 2000-09-12 02:54:07 +0000 |
| commit | bed586cb61176442efcc2d66184679bdc16e386c (patch) | |
| tree | 15ef79f58e04752d22712bd63c7ff4018867481f /helper-utilities | |
| parent | 6f04b6b341b32ad282ebff234e45a82b7147e884 (diff) | |
| download | nautilus-bed586cb61176442efcc2d66184679bdc16e386c.tar.gz | |
Fix function prototype problem with PAM on Linux.
2000-09-11 Seth Nickell <seth@eazel.com>
* helper-utilities/authenticate/nautilus-authenticate-pam.c:
(pam_conversion_func), (nautilus_authenticate_authenticate):
Fix function prototype problem with PAM on Linux.
* libnautilus/nautilus-view-component.idl:
Commented FIXMEs better.
Diffstat (limited to 'helper-utilities')
| -rw-r--r-- | helper-utilities/authenticate/nautilus-authenticate-pam.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/helper-utilities/authenticate/nautilus-authenticate-pam.c b/helper-utilities/authenticate/nautilus-authenticate-pam.c index baa974fd3..921537d08 100644 --- a/helper-utilities/authenticate/nautilus-authenticate-pam.c +++ b/helper-utilities/authenticate/nautilus-authenticate-pam.c @@ -37,7 +37,7 @@ typedef struct _PamConvData } PamConvData; static int pam_conversion_func (int num_msg, - struct pam_message **msg, + const struct pam_message **msg, struct pam_response **response, void *appdata_ptr) { @@ -111,8 +111,12 @@ nautilus_authenticate_authenticate(const char *username, client_data.username = username_copy; client_data.password = password_copy; - /* Setup the pam conversion structure */ - pam_conv_data.conv = pam_conversion_func; + /* Setup the pam conversion structure. + * Need to cast here because Solaris and Linux use a function prototype + * that differs by const of struct pam_message ** + */ + pam_conv_data.conv = (int (*)(int, const struct pam_message **, + struct pam_response **, void *)) pam_conversion_func; pam_conv_data.appdata_ptr = (void *) &client_data; /* Start pam */ |