openpam.h | openpam.h | |||
---|---|---|---|---|
skipping to change at line 34 | skipping to change at line 34 | |||
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPO SE | * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPO SE | |||
* ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE | * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE | |||
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTI AL | * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTI AL | |||
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS | * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS | |||
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) | * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) | |||
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRI CT | * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRI CT | |||
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WA Y | * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WA Y | |||
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF | * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF | |||
* SUCH DAMAGE. | * SUCH DAMAGE. | |||
* | * | |||
* $P4: //depot/projects/openpam/include/security/openpam.h#26 $ | * $P4: //depot/projects/openpam/include/security/openpam.h#27 $ | |||
*/ | */ | |||
#ifndef _SECURITY_OPENPAM_H_INCLUDED | #ifndef _SECURITY_OPENPAM_H_INCLUDED | |||
#define _SECURITY_OPENPAM_H_INCLUDED | #define _SECURITY_OPENPAM_H_INCLUDED | |||
/* | /* | |||
* Annoying but necessary header pollution | * Annoying but necessary header pollution | |||
*/ | */ | |||
#include <stdarg.h> | #include <stdarg.h> | |||
skipping to change at line 150 | skipping to change at line 150 | |||
PAM_LOG_ERROR | PAM_LOG_ERROR | |||
}; | }; | |||
/* | /* | |||
* Log to syslog | * Log to syslog | |||
*/ | */ | |||
void | void | |||
_openpam_log(int _level, | _openpam_log(int _level, | |||
const char *_func, | const char *_func, | |||
const char *_fmt, | const char *_fmt, | |||
...); | ...) | |||
#if defined(__GNUC__) | ||||
__attribute__((__format__(__printf__, 3, 4))) | ||||
#endif | ||||
; | ||||
#if defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L) | #if defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L) | |||
#define openpam_log(lvl, ...) \ | #define openpam_log(lvl, ...) \ | |||
_openpam_log((lvl), __func__, __VA_ARGS__) | _openpam_log((lvl), __func__, __VA_ARGS__) | |||
#elif defined(__GNUC__) && (__GNUC__ >= 3) | #elif defined(__GNUC__) && (__GNUC__ >= 3) | |||
#define openpam_log(lvl, ...) \ | #define openpam_log(lvl, ...) \ | |||
_openpam_log((lvl), __func__, __VA_ARGS__) | _openpam_log((lvl), __func__, __VA_ARGS__) | |||
#elif defined(__GNUC__) && (__GNUC__ >= 2) && (__GNUC_MINOR__ >= 95) | #elif defined(__GNUC__) && (__GNUC__ >= 2) && (__GNUC_MINOR__ >= 95) | |||
#define openpam_log(lvl, fmt...) \ | #define openpam_log(lvl, fmt...) \ | |||
_openpam_log((lvl), __func__, ##fmt) | _openpam_log((lvl), __func__, ##fmt) | |||
End of changes. 2 change blocks. | ||||
2 lines changed or deleted | 6 lines changed or added | |||
openpam_version.h | openpam_version.h | |||
---|---|---|---|---|
skipping to change at line 34 | skipping to change at line 34 | |||
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPO SE | * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPO SE | |||
* ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE | * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE | |||
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTI AL | * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTI AL | |||
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS | * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS | |||
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) | * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) | |||
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRI CT | * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRI CT | |||
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WA Y | * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WA Y | |||
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF | * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF | |||
* SUCH DAMAGE. | * SUCH DAMAGE. | |||
* | * | |||
* $P4: //depot/projects/openpam/include/security/openpam_version.h#11 $ | * $P4: //depot/projects/openpam/include/security/openpam_version.h#12 $ | |||
*/ | */ | |||
#ifndef _OPENPAM_VERSION_H_INCLUDED | #ifndef _OPENPAM_VERSION_H_INCLUDED | |||
#define _OPENPAM_VERSION_H_INCLUDED | #define _OPENPAM_VERSION_H_INCLUDED | |||
#define _OPENPAM | #define _OPENPAM | |||
#define _OPENPAM_VERSION 20030715 | #define _OPENPAM_VERSION 20040210 | |||
#define _OPENPAM_RELEASE "Dogwood" | #define _OPENPAM_RELEASE "Eelgrass" | |||
#endif | #endif | |||
End of changes. 2 change blocks. | ||||
3 lines changed or deleted | 3 lines changed or added | |||
pam_appl.h | pam_appl.h | |||
---|---|---|---|---|
skipping to change at line 34 | skipping to change at line 34 | |||
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPO SE | * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPO SE | |||
* ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE | * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE | |||
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTI AL | * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTI AL | |||
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS | * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS | |||
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) | * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) | |||
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRI CT | * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRI CT | |||
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WA Y | * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WA Y | |||
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF | * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF | |||
* SUCH DAMAGE. | * SUCH DAMAGE. | |||
* | * | |||
* $P4: //depot/projects/openpam/include/security/pam_appl.h#13 $ | * $P4: //depot/projects/openpam/include/security/pam_appl.h#14 $ | |||
*/ | */ | |||
#ifndef _PAM_APPL_H_INCLUDED | #ifndef _PAM_APPL_H_INCLUDED | |||
#define _PAM_APPL_H_INCLUDED | #define _PAM_APPL_H_INCLUDED | |||
#include <security/pam_types.h> | #include <security/pam_types.h> | |||
#include <security/pam_constants.h> | #include <security/pam_constants.h> | |||
#ifdef __cplusplus | #ifdef __cplusplus | |||
extern "C" { | extern "C" { | |||
skipping to change at line 74 | skipping to change at line 74 | |||
pam_close_session(pam_handle_t *_pamh, | pam_close_session(pam_handle_t *_pamh, | |||
int _flags); | int _flags); | |||
int | int | |||
pam_end(pam_handle_t *_pamh, | pam_end(pam_handle_t *_pamh, | |||
int _status); | int _status); | |||
int | int | |||
pam_get_data(pam_handle_t *_pamh, | pam_get_data(pam_handle_t *_pamh, | |||
const char *_module_data_name, | const char *_module_data_name, | |||
const void **_data); | void **_data); | |||
int | int | |||
pam_get_item(pam_handle_t *_pamh, | pam_get_item(pam_handle_t *_pamh, | |||
int _item_type, | int _item_type, | |||
const void **_item); | const void **_item); | |||
int | int | |||
pam_get_user(pam_handle_t *_pamh, | pam_get_user(pam_handle_t *_pamh, | |||
const char **_user, | const char **_user, | |||
const char *_prompt); | const char *_prompt); | |||
End of changes. 2 change blocks. | ||||
2 lines changed or deleted | 2 lines changed or added | |||
pam_types.h | pam_types.h | |||
---|---|---|---|---|
skipping to change at line 34 | skipping to change at line 34 | |||
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPO SE | * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPO SE | |||
* ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE | * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE | |||
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTI AL | * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTI AL | |||
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS | * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS | |||
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) | * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) | |||
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRI CT | * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRI CT | |||
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WA Y | * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WA Y | |||
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF | * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF | |||
* SUCH DAMAGE. | * SUCH DAMAGE. | |||
* | * | |||
* $P4: //depot/projects/openpam/include/security/pam_types.h#12 $ | * $P4: //depot/projects/openpam/include/security/pam_types.h#13 $ | |||
*/ | */ | |||
#ifndef _PAM_TYPES_H_INCLUDED | #ifndef _PAM_TYPES_H_INCLUDED | |||
#define _PAM_TYPES_H_INCLUDED | #define _PAM_TYPES_H_INCLUDED | |||
#include <stddef.h> | #include <stddef.h> | |||
#ifdef __cplusplus | #ifdef __cplusplus | |||
extern "C" { | extern "C" { | |||
#endif | #endif | |||
/* | /* | |||
* XSSO 5.1.1 | * XSSO 5.1.1 | |||
*/ | */ | |||
struct pam_message { | struct pam_message { | |||
int msg_style; | int msg_style; | |||
const char *msg; | char *msg; | |||
}; | }; | |||
struct pam_response { | struct pam_response { | |||
char *resp; | char *resp; | |||
int resp_retcode; | int resp_retcode; | |||
}; | }; | |||
/* | /* | |||
* XSSO 5.1.2 | * XSSO 5.1.2 | |||
*/ | */ | |||
struct pam_conv { | struct pam_conv { | |||
int (*conv)(int, const struct pam_message **, | int (*conv)(int, const struct pam_message **, | |||
struct pam_response **, void *); | struct pam_response **, void *); | |||
void *appdata_ptr; | void *appdata_ptr; | |||
}; | }; | |||
/* | /* | |||
* XSSO 5.1.3 | * XSSO 5.1.3 | |||
*/ | */ | |||
struct pam_handle; | struct pam_handle; | |||
typedef struct pam_handle pam_handle_t; | typedef struct pam_handle pam_handle_t; | |||
/* | /* | |||
* Solaris 9 | * Solaris 9 | |||
*/ | */ | |||
typedef struct pam_repository { | typedef struct pam_repository { | |||
char *type; | char *type; | |||
void *scope; | void *scope; | |||
size_t scope_len; | size_t scope_len; | |||
} pam_repository_t; | } pam_repository_t; | |||
#ifdef __cplusplus | #ifdef __cplusplus | |||
} | } | |||
#endif | #endif | |||
#endif | #endif | |||
End of changes. 5 change blocks. | ||||
11 lines changed or deleted | 11 lines changed or added | |||