entity.h | entity.h | |||
---|---|---|---|---|
skipping to change at line 156 | skipping to change at line 156 | |||
* | * | |||
* Don't modify passwords by changing this attribute directly, use one of t he | * Don't modify passwords by changing this attribute directly, use one of t he | |||
* specialized functions. | * specialized functions. | |||
*/ | */ | |||
#define LU_SHADOWPASSWORD "sp_pwdp" | #define LU_SHADOWPASSWORD "sp_pwdp" | |||
/** | /** | |||
* LU_SHADOWLASTCHANGE: | * LU_SHADOWLASTCHANGE: | |||
* | * | |||
* The number of days since the epoch to the day when the password was last | * The number of days since the epoch to the day when the password was last | |||
* changed, a %G_TYPE_LONG. | * changed, a %G_TYPE_LONG. | |||
* | ||||
* May be -1 to indicate that the field exists without a value. This shoul | ||||
d be | ||||
* handled the same as if the attribute was missing altogether, and consist | ||||
ently | ||||
* with shadow(5). | ||||
*/ | */ | |||
#define LU_SHADOWLASTCHANGE "sp_lstchg" | #define LU_SHADOWLASTCHANGE "sp_lstchg" | |||
/** | /** | |||
* LU_SHADOWMIN: | * LU_SHADOWMIN: | |||
* | * | |||
* Minimum password lifetime in days before it can be changed, a %G_TYPE_LO NG. | * Minimum password lifetime in days before it can be changed, a %G_TYPE_LO NG. | |||
* | ||||
* May be -1 to indicate that the field exists without a value. This shoul | ||||
d be | ||||
* handled the same as if the attribute was missing altogether, and consist | ||||
ently | ||||
* with shadow(5). | ||||
*/ | */ | |||
#define LU_SHADOWMIN "sp_min" | #define LU_SHADOWMIN "sp_min" | |||
/** | /** | |||
* LU_SHADOWMAX: | * LU_SHADOWMAX: | |||
* | * | |||
* Maximum password lifetime in days before it must be changed, a %G_TYPE_L ONG. | * Maximum password lifetime in days before it must be changed, a %G_TYPE_L ONG. | |||
* | ||||
* May be -1 to indicate that the field exists without a value. This shoul | ||||
d be | ||||
* handled the same as if the attribute was missing altogether, and consist | ||||
ently | ||||
* with shadow(5). | ||||
*/ | */ | |||
#define LU_SHADOWMAX "sp_max" | #define LU_SHADOWMAX "sp_max" | |||
/** | /** | |||
* LU_SHADOWWARNING: | * LU_SHADOWWARNING: | |||
* | * | |||
* Days before the password lifetime expires when the user should start to be | * Days before the password lifetime expires when the user should start to be | |||
* warned, a %G_TYPE_LONG. | * warned, a %G_TYPE_LONG. | |||
* | ||||
* May be -1 to indicate that the field exists without a value. This shoul | ||||
d be | ||||
* handled the same as if the attribute was missing altogether, and consist | ||||
ently | ||||
* with shadow(5). | ||||
*/ | */ | |||
#define LU_SHADOWWARNING "sp_warn" | #define LU_SHADOWWARNING "sp_warn" | |||
/** | /** | |||
* LU_SHADOWINACTIVE: | * LU_SHADOWINACTIVE: | |||
* | * | |||
* Days after the password lifetime expires when the user account is disabl ed | * Days after the password lifetime expires when the user account is disabl ed | |||
* (because it is considered inactive), a %G_TYPE_LONG. -1 to disable inac tive | * (because it is considered inactive), a %G_TYPE_LONG. -1 to disable inac tive | |||
* account disabling. | * account disabling. | |||
*/ | */ | |||
#define LU_SHADOWINACTIVE "sp_inact" | #define LU_SHADOWINACTIVE "sp_inact" | |||
End of changes. 4 change blocks. | ||||
0 lines changed or deleted | 24 lines changed or added | |||
user_private.h | user_private.h | |||
---|---|---|---|---|
skipping to change at line 312 | skipping to change at line 312 | |||
const char *lu_make_crypted(const char *plain, const char *previous); | const char *lu_make_crypted(const char *plain, const char *previous); | |||
char *lu_util_default_salt_specifier(struct lu_context *context); | char *lu_util_default_salt_specifier(struct lu_context *context); | |||
/* Handle SELinux fscreate context. Note that modules built WITH_SELINUX a re | /* Handle SELinux fscreate context. Note that modules built WITH_SELINUX a re | |||
intentionally not compatible with libuser built !WITH_SELINUX. */ | intentionally not compatible with libuser built !WITH_SELINUX. */ | |||
#ifdef WITH_SELINUX | #ifdef WITH_SELINUX | |||
typedef security_context_t lu_security_context_t; | typedef security_context_t lu_security_context_t; | |||
gboolean lu_util_fscreate_save(security_context_t *ctx, | gboolean lu_util_fscreate_save(security_context_t *ctx, | |||
struct lu_error **error); | struct lu_error **error); | |||
void lu_util_fscreate_restore(security_context_t ctx); | void lu_util_fscreate_restore(security_context_t ctx); | |||
gboolean lu_util_fscreate_from_fd(int fd, const char *path, | ||||
struct lu_error **error); | ||||
gboolean lu_util_fscreate_from_file(const char *file, struct lu_error **err or); | gboolean lu_util_fscreate_from_file(const char *file, struct lu_error **err or); | |||
gboolean lu_util_fscreate_from_lfile(const char *file, struct lu_error **er ror); | ||||
gboolean lu_util_fscreate_for_path(const char *path, mode_t mode, | gboolean lu_util_fscreate_for_path(const char *path, mode_t mode, | |||
struct lu_error **error); | struct lu_error **error); | |||
#else | #else | |||
typedef char lu_security_context_t; /* "Something" */ | typedef char lu_security_context_t; /* "Something" */ | |||
#define lu_util_fscreate_save(CTX, ERROR) ((void)(CTX), (void)(ERROR), TRUE ) | #define lu_util_fscreate_save(CTX, ERROR) ((void)(CTX), (void)(ERROR), TRUE ) | |||
#define lu_util_fscreate_restore(CTX) ((void)(CTX)) | #define lu_util_fscreate_restore(CTX) ((void)(CTX)) | |||
#define lu_util_fscreate_from_fd(FD, PATH, ERROR) \ | ||||
((void)(FD), (void)(PATH), (void)(ERROR), TRUE) | ||||
#define lu_util_fscreate_from_file(FILE, ERROR) \ | #define lu_util_fscreate_from_file(FILE, ERROR) \ | |||
((void)(FILE), (void)(ERROR), TRUE) | ((void)(FILE), (void)(ERROR), TRUE) | |||
#define lu_util_fscreate_from_lfile(FILE, ERROR) \ | ||||
((void)(FILE), (void)(ERROR), TRUE) | ||||
#define lu_util_fscreate_for_path(PATH, MODE, ERROR) \ | #define lu_util_fscreate_for_path(PATH, MODE, ERROR) \ | |||
((void)(PATH), (void)(MODE), (void)(ERROR), TRUE) | ((void)(PATH), (void)(MODE), (void)(ERROR), TRUE) | |||
#endif | #endif | |||
/* Lock a file. */ | /* Lock a file. */ | |||
gpointer lu_util_lock_obtain(int fd, struct lu_error **error); | gpointer lu_util_lock_obtain(int fd, struct lu_error **error); | |||
void lu_util_lock_free(gpointer lock); | void lu_util_lock_free(gpointer lock); | |||
/* Manipulate a colon-delimited flat text file. */ | /* Manipulate a colon-delimited flat text file. */ | |||
char *lu_util_line_get_matching1(int fd, const char *firstpart, | char *lu_util_line_get_matching1(int fd, const char *firstpart, | |||
End of changes. 4 change blocks. | ||||
0 lines changed or deleted | 7 lines changed or added | |||