Description: dyson uses Linux PAM Index: virtualbox/src/VBox/Additions/common/pam/pam_vbox.cpp =================================================================== --- virtualbox.orig/src/VBox/Additions/common/pam/pam_vbox.cpp 2013-06-25 00:14:55.626573397 +0400 +++ virtualbox/src/VBox/Additions/common/pam/pam_vbox.cpp 2013-06-29 17:54:04.385175107 +0400 @@ -100,13 +100,9 @@ */ static void pam_vbox_writesyslog(char *pszBuf) { -#ifdef RT_OS_LINUX openlog("pam_vbox", LOG_PID, LOG_AUTHPRIV); syslog(LOG_ERR, "%s", pszBuf); closelog(); -#elif defined(RT_OS_SOLARIS) - syslog(LOG_ERR, "pam_vbox: %s\n", pszBuf); -#endif } @@ -179,28 +175,15 @@ pam_message msg; msg.msg_style = iStyle; -#ifdef RT_OS_SOLARIS - msg.msg = (char*)pszText; -#else msg.msg = pszText; -#endif -#ifdef RT_OS_SOLARIS - pam_conv *conv = NULL; - int pamrc = pam_get_item(hPAM, PAM_CONV, (void **)&conv); -#else const pam_conv *conv = NULL; int pamrc = pam_get_item(hPAM, PAM_CONV, (const void **)&conv); -#endif if ( pamrc == PAM_SUCCESS && conv) { pam_response *resp = NULL; -#ifdef RT_OS_SOLARIS - pam_message *msg_p = &msg; -#else const pam_message *msg_p = &msg; -#endif pam_vbox_log(hPAM, "Showing message \"%s\" (type %d)", pszText, iStyle); pamrc = conv->conv(1 /* One message only */, &msg_p, &resp, conv->appdata_ptr); @@ -278,15 +261,9 @@ char *rhost = NULL; char *tty = NULL; char *prompt = NULL; -#ifdef RT_OS_SOLARIS - pam_get_item(hPAM, PAM_RHOST, (void**) &rhost); - pam_get_item(hPAM, PAM_TTY, (void**) &tty); - pam_get_item(hPAM, PAM_USER_PROMPT, (void**) &prompt); -#else pam_get_item(hPAM, PAM_RHOST, (const void**) &rhost); pam_get_item(hPAM, PAM_TTY, (const void**) &tty); pam_get_item(hPAM, PAM_USER_PROMPT, (const void**) &prompt); -#endif pam_vbox_log(hPAM, "pam_vbox_init: rhost=%s, tty=%s, prompt=%s\n", rhost ? rhost : "", tty ? tty : "", prompt ? prompt : ""); }