Index: stable/9/etc/pam.d/README
===================================================================
--- stable/9/etc/pam.d/README	(revision 271065)
+++ stable/9/etc/pam.d/README	(revision 271066)
@@ -1,62 +1,62 @@
 
 This directory contains configuration files for the Pluggable
 Authentication Modules (PAM) library.
 
 Each file details the module chain for a single service, and must be
 named after that service.  If no configuration file is found for a
 particular service, the /etc/pam.d/other is used instead.  If that
 file does not exist, /etc/pam.conf is searched for entries matching
 the specified service or, failing that, the "other" service.
 
-See the pam(8) manual page for an explanation of the workings of the
+See the pam(3) manual page for an explanation of the workings of the
 PAM library and descriptions of the various files and modules.  Below
 is a summary of the format for the pam.conf and /etc/pam.d/* files.
 
 Configuration lines take the following form:
 
 module-type	control-flag	module-path	arguments
 
 Comments are introduced with a hash mark ('#').  Blank lines and lines
 consisting entirely of comments are ignored.
 
 The meanings of the different fields are as follows:
 
  module-type:
    auth:      prompt for a password to authenticate that the user is
               who they say they are, and set any credentials.
    account:   non-authentication based authorization, based on time,
               resources, etc.
    session:   housekeeping before and/or after login.
    password:  update authentication tokens.
 
  control-flag: How libpam handles success or failure of the module.
    required:   success is required; on failure all remaining
                modules are run, but the request will be denied.
    requisite:  success is required, and on failure no remaining
                modules are run.
    sufficient: success is sufficient, and if no previous required
                module failed, no remaining modules are run.
    binding:    success is sufficient; on failure all remaining
                modules are run, but the request will be denied.
    optional:   ignored unless the other modules return PAM_IGNORE.
 
  arguments: Module-specific options, plus some generic ones:
    debug:           syslog debug info.
    no_warn:         return no warning messages to the application.
                     Remove this to feed back to the user the
                     reason(s) they are being rejected.
    use_first_pass:  try authentication using password from the
                     preceding auth module.
    try_first_pass:  first try authentication using password from
                     the preceding auth module, and if that fails
                     prompt for a new password.
    use_mapped_pass: convert cleartext password to a crypto key.
    expose_account:  allow printing more info about the user when
                     prompting.
 
 Note that having a "sufficient" module as the last entry for a
 particular service and module type may result in surprising behaviour.
 To get the intended semantics, add a "required" entry listing the
 pam_deny module at the end of the chain.
 
 $FreeBSD$
Index: stable/9/etc/pam.d
===================================================================
--- stable/9/etc/pam.d	(revision 271065)
+++ stable/9/etc/pam.d	(revision 271066)

Property changes on: stable/9/etc/pam.d
___________________________________________________________________
Added: svn:mergeinfo
## -0,0 +0,5 ##
   Merged /head/etc/pam.d:r225777,225790,225849,225861,225880,226221,226277,226345,226449,226464,226471,226534,226649,226652,226654,226657,226775,226860,226862,226865,226879,226903,227006,227112,227482,227983,227987,228191,228270,228277,228472,229822,229850,230007,230099,230374,230388-230389,230403,230453,230640,231171,231194,231226,231507,231563,231575,231667,231852,231862,231888,232177,232498,232515,232976,233048,233111,233167,233429,233435,233437,233506,234077,234133,234135,234159,234353,234823,234927,235132,235203,235725,236965,237269-237270,237279,237337,237921,238102,238605,238622,239056,239382,239462,239464,240109,240336,240343,240621,240891,241089,241507,241708,241788,242181,242183-242184,242452,242462,242514,242541,242784,243080,243101,243184,243324,243568,243661,243752,243893,244096,244181,244252,244383,244522,244770,244830,244835,245034,245250,245316,245318,245440,245525,245565,245571,245580,245752,245825,246097,246127,246255,246358,246367,246913,247162,247271,248820,249095,249210,249423,249489,249555,249732,250116,250533,250617,250804,251512,251597,252015,252200,252205,252230,252360,252426,253076,253444,253505,253520,253672,253853,253936,254132,255124,255243,255384-255385,255413,255425,255597,255766-255767,255774,255829,255878,256097,256126,256775,257145,257147,257150,257159,257164,257168,257344,257667-257668,257954,258227,258332,258364,258894,259033,259940,259973,260220,260486,261199,261260,261262,261283,261315,261320,261343,261479,261546,261991,262273,262613,263937,264243,264420,265925,266463,266475,266529,266895,267486,267671,267812,270677
   Merged /projects/largeSMP/etc/pam.d:r221273-222812,222815-223757
   Merged /vendor/resolver/dist/etc/pam.d:r1540-186085
   Merged /projects/clang-sparc64/etc/pam.d:r262258-262612
   Merged /projects/quota64/etc/pam.d:r184125-207707