openpam.h   openpam.h 
skipping to change at line 35 skipping to change at line 35
* 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.
* *
* $Id: openpam.h 455 2011-10-29 18:31:11Z des $ * $Id: openpam.h 605 2012-04-20 11:05:10Z des $
*/ */
#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 160 skipping to change at line 160
* Read cooked lines. * Read cooked lines.
* Checking for _IOFBF is a fairly reliable way to detect the presence * Checking for _IOFBF is a fairly reliable way to detect the presence
* of <stdio.h>, as SUSv3 requires it to be defined there. * of <stdio.h>, as SUSv3 requires it to be defined there.
*/ */
#ifdef _IOFBF #ifdef _IOFBF
char * char *
openpam_readline(FILE *_f, openpam_readline(FILE *_f,
int *_lineno, int *_lineno,
size_t *_lenp) size_t *_lenp)
OPENPAM_NONNULL((1)); OPENPAM_NONNULL((1));
char **
openpam_readlinev(FILE *_f,
int *_lineno,
int *_lenp)
OPENPAM_NONNULL((1));
char *
openpam_readword(FILE *_f,
int *_lineno,
size_t *_lenp)
OPENPAM_NONNULL((1));
#endif #endif
int
openpam_straddch(char **_str,
size_t *_sizep,
size_t *_lenp,
int ch)
OPENPAM_NONNULL((1));
/*
* Enable / disable optional features
*/
enum {
OPENPAM_RESTRICT_SERVICE_NAME,
OPENPAM_VERIFY_POLICY_FILE,
OPENPAM_RESTRICT_MODULE_NAME,
OPENPAM_VERIFY_MODULE_FILE,
OPENPAM_NUM_FEATURES
};
int
openpam_set_feature(int _feature, int _onoff);
int
openpam_get_feature(int _feature, int *_onoff);
/* /*
* Log levels * Log levels
*/ */
enum { enum {
PAM_LOG_LIBDEBUG = -1,
PAM_LOG_DEBUG, PAM_LOG_DEBUG,
PAM_LOG_VERBOSE, PAM_LOG_VERBOSE,
PAM_LOG_NOTICE, PAM_LOG_NOTICE,
PAM_LOG_ERROR PAM_LOG_ERROR
}; };
/* /*
* Log to syslog * Log to syslog
*/ */
void void
skipping to change at line 199 skipping to change at line 236
#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)
#elif defined(__GNUC__) && defined(__FUNCTION__) #elif defined(__GNUC__) && defined(__FUNCTION__)
#define openpam_log(lvl, fmt...) \ #define openpam_log(lvl, fmt...) \
_openpam_log((lvl), __FUNCTION__, ##fmt) _openpam_log((lvl), __FUNCTION__, ##fmt)
#else #else
void void
openpam_log(int _level, openpam_log(int _level,
const char *_format, const char *_format,
...) ...)
OPENPAM_FORMAT ((__printf__, 2, 3)) OPENPAM_FORMAT ((__printf__, 2, 3))
OPENPAM_NONNULL((2)); OPENPAM_NONNULL((2));
#endif #endif
/* /*
* Generic conversation function * Generic conversation function
*/ */
struct pam_message; struct pam_message;
struct pam_response; struct pam_response;
int openpam_ttyconv(int _n, int openpam_ttyconv(int _n,
const struct pam_message **_msg, const struct pam_message **_msg,
 End of changes. 5 change blocks. 
3 lines changed or deleted 40 lines changed or added


 openpam_version.h   openpam_version.h 
skipping to change at line 35 skipping to change at line 35
* 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.
* *
* $Id: openpam_version.h 505 2011-12-18 14:13:08Z des $ * $Id: openpam_version.h 609 2012-05-26 13:57:45Z des $
*/ */
#ifndef SECURITY_OPENPAM_VERSION_H_INCLUDED #ifndef SECURITY_OPENPAM_VERSION_H_INCLUDED
#define SECURITY_OPENPAM_VERSION_H_INCLUDED #define SECURITY_OPENPAM_VERSION_H_INCLUDED
#define OPENPAM #define OPENPAM
#define OPENPAM_VERSION 20111218 #define OPENPAM_VERSION 20120526
#define OPENPAM_RELEASE "Lycopsida" #define OPENPAM_RELEASE "Micrampelis"
#endif /* !SECURITY_OPENPAM_VERSION_H_INCLUDED */ #endif /* !SECURITY_OPENPAM_VERSION_H_INCLUDED */
 End of changes. 2 change blocks. 
3 lines changed or deleted 3 lines changed or added

This html diff was produced by rfcdiff 1.41. The latest version is available from http://tools.ietf.org/tools/rfcdiff/