ViewVC Help
View File | Revision Log | Show Annotations | Download File | View Changeset | Root Listing
root/repos/CCSAdmin/common.c
(Generate patch)

Comparing CCSAdmin/common.c (file contents):
Revision 589 by douglas, 2005-11-25T05:49:24-08:00 vs.
Revision 807 by douglas, 2006-06-29T07:39:29-07:00

# Line 14 | Line 14 | Shells shells[] = {
14          { "sh", "/bin/sh", "/bin/sh", "/bin/sh", "/usr/bin/sh" },
15          { "csh", "/bin/csh", "/bin/csh", "/bin/csh", "/usr/bin/csh" },
16          { "tcsh", "/bin/tcsh", "/bin/tcsh", "/bin/tcsh", "/usr/bin/tcsh" },
17 <        { "bash", "/usr/local/bin/bash", "/bin/bash", "/bin/bash", "/usr/local/bin/bash" },
17 >        { "bash", "/usr/local/bin/bash", "/bin/bash", "/opt/local/bin/bash", "/usr/local/bin/bash" },
18          { "ksh", "/usr/local/bin/ksh", "/bin/ksh", "/bin/ksh", "/usr/bin/ksh" },
19          { "zsh", "/usr/local/bin/zsh", "/bin/zsh", "/bin/zsh", "/usr/bin/zsh" },
20          { "3sh", "/ccs/bin/3sh", "/ccs/bin/3sh", "/ccs/bin/3sh", "/ccs/bin/3sh" },
# Line 50 | Line 50 | char *fcheck(char *value, FILE *stream,
50                          longjmp(environment, 1);
51                  else
52                  {
53 <                        clearerr(stdin);
54 <                        printf("\n");
53 >                        clearerr(stream);
54 >
55 >                        if (stream == stdin)
56 >                                printf("\n");
57  
58                          return "";
59                  }
# Line 91 | Line 93 | void authenticate(const char *program, j
93          {
94                  check(dup2(pipe_[1], 1), environment);
95                  check(close(pipe_[0]), environment);
96 <                check(execl(LDAPWHOAMI, program, "-D", name, "-W", "-x", "-y", secret, NULL), environment);
96 >                check(execl(LDAPWHOAMI, program, "-D", name, "-H", "ldaps://" MASTER, "-W", "-x", "-y", secret, NULL), environment);
97          }
98  
99          check(close(pipe_[1]), environment);
# Line 161 | Line 163 | void setshells(Shells *shells, jmp_buf e
163          check(setenv("SOLARIS", shells->solaris, 1), environment);
164   }
165  
166 < #if !defined(__FreeBSD__) && !defined(__sun__)
166 > #if !defined(__FreeBSD__) && !defined(__sun__) && !defined(__APPLE__)
167   size_t strlcpy(char *dst, const char *src, size_t size)
168   {
169          dst[size - 1] = '\0';

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines