[BACK]Return to monitor.c CVS log [TXT][DIR] Up to [local] / src / usr.bin / ssh

Diff for /src/usr.bin/ssh/monitor.c between version 1.166 and 1.167

version 1.166, 2016/09/28 16:33:06 version 1.167, 2017/02/03 23:05:57
Line 224 
Line 224 
 void  void
 monitor_child_preauth(Authctxt *_authctxt, struct monitor *pmonitor)  monitor_child_preauth(Authctxt *_authctxt, struct monitor *pmonitor)
 {  {
           struct ssh *ssh = active_state; /* XXX */
         struct mon_table *ent;          struct mon_table *ent;
         int authenticated = 0, partial = 0;          int authenticated = 0, partial = 0;
   
Line 283 
Line 284 
   
         debug("%s: %s has been authenticated by privileged process",          debug("%s: %s has been authenticated by privileged process",
             __func__, authctxt->user);              __func__, authctxt->user);
           ssh_packet_set_log_preamble(ssh, "user %s", authctxt->user);
   
         mm_get_keystate(pmonitor);          mm_get_keystate(pmonitor);
   
Line 619 
Line 621 
 int  int
 mm_answer_pwnamallow(int sock, Buffer *m)  mm_answer_pwnamallow(int sock, Buffer *m)
 {  {
           struct ssh *ssh = active_state; /* XXX */
         char *username;          char *username;
         struct passwd *pwent;          struct passwd *pwent;
         int allowed = 0;          int allowed = 0;
Line 659 
Line 662 
         buffer_put_cstring(m, pwent->pw_shell);          buffer_put_cstring(m, pwent->pw_shell);
   
  out:   out:
           ssh_packet_set_log_preamble(ssh, "%suser %s",
               authctxt->valid ? "authenticating" : "invalid ", authctxt->user);
         buffer_put_string(m, &options, sizeof(options));          buffer_put_string(m, &options, sizeof(options));
   
 #define M_CP_STROPT(x) do { \  #define M_CP_STROPT(x) do { \
Legend:
Removed from v.1.166  
changed lines
  Added in v.1.167