mirror of
https://github.com/samba-team/samba.git
synced 2024-12-25 23:21:54 +03:00
33a003de40
1) put the encryption code in by default, with no #ifdef. It is still
disabled by default so you need to add "encrypt passwords = yes" in
smb.conf but at least all binaries will have it.
2) cleanup the kanji code so it compiles with no warnings
3) get rid of lots of uses of ugly non-portable C code. The main
offender being things like "register" but also remove uses of the
"const" keyword as there are compilers out there that don't support it
and even those that do often complain about its usage. Users don't
like warnings :-(
There is still some work to do. We need to replace the md4 code with
our own implementation. The current code (from rfc1186) is PD but is
not very portable. The new RFC (rfc1320) is more portable but adds
copyright restrictions. I'll do a from-scratch MD4 soon.
We also need to test that what I've implemented is portable. It should
be, but I'm too tired right now to test it on anything other than
intel linux.
(This used to be commit db917c62c1
)
166 lines
3.5 KiB
C
166 lines
3.5 KiB
C
/* Copyright (C) 1992-1997 Free Software Foundation, Inc.
|
|
This file is part of the GNU C Library.
|
|
|
|
The GNU C Library is free software; you can redistribute it and/or
|
|
modify it under the terms of the GNU Library General Public License as
|
|
published by the Free Software Foundation; either version 2 of the
|
|
License, or (at your option) any later version.
|
|
|
|
The GNU C Library is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
Library General Public License for more details.
|
|
|
|
You should have received a copy of the GNU Library General Public
|
|
License along with the GNU C Library; see the file COPYING.LIB. If
|
|
not, write to the Free Software Foundation, Inc., 675 Mass Ave,
|
|
Cambridge, MA 02139, USA. */
|
|
|
|
/* Modified to use with samba by Jeremy Allison, 8th July 1995. */
|
|
|
|
#include "includes.h"
|
|
|
|
#ifdef REPLACE_GETPASS
|
|
|
|
#ifdef SYSV_TERMIO
|
|
|
|
/* SYSTEM V TERMIO HANDLING */
|
|
|
|
static struct termio t;
|
|
|
|
#define ECHO_IS_ON(t) ((t).c_lflag & ECHO)
|
|
#define TURN_ECHO_OFF(t) ((t).c_lflag &= ~ECHO)
|
|
#define TURN_ECHO_ON(t) ((t).c_lflag |= ECHO)
|
|
|
|
#ifndef TCSAFLUSH
|
|
#define TCSAFLUSH 1
|
|
#endif
|
|
|
|
#ifndef TCSANOW
|
|
#define TCSANOW 0
|
|
#endif
|
|
|
|
int tcgetattr(int fd, struct termio *t)
|
|
{
|
|
return ioctl(fd, TCGETA, t);
|
|
}
|
|
|
|
int tcsetattr(int fd, int flags, struct termio *t)
|
|
{
|
|
if(flags & TCSAFLUSH)
|
|
ioctl(fd, TCFLSH, TCIOFLUSH);
|
|
return ioctl(fd, TCSETS, t);
|
|
}
|
|
|
|
#else /* SYSV_TERMIO */
|
|
#ifdef BSD_TERMIO
|
|
|
|
/* BSD TERMIO HANDLING */
|
|
|
|
static struct sgttyb t;
|
|
|
|
#define ECHO_IS_ON(t) ((t).sg_flags & ECHO)
|
|
#define TURN_ECHO_OFF(t) ((t).sg_flags &= ~ECHO)
|
|
#define TURN_ECHO_ON(t) ((t).sg_flags |= ECHO)
|
|
|
|
#ifndef TCSAFLUSH
|
|
#define TCSAFLUSH 1
|
|
#endif
|
|
|
|
#ifndef TCSANOW
|
|
#define TCSANOW 0
|
|
#endif
|
|
|
|
int tcgetattr(int fd, struct sgttyb *t)
|
|
{
|
|
return ioctl(fd, TIOCGETP, (char *)t);
|
|
}
|
|
|
|
int tcsetattr(int fd, int flags, struct sgttyb *t)
|
|
{
|
|
return ioctl(fd, TIOCSETP, (char *)t);
|
|
}
|
|
|
|
#else /* BSD_TERMIO */
|
|
|
|
/* POSIX TERMIO HANDLING */
|
|
#define ECHO_IS_ON(t) ((t).c_lflag & ECHO)
|
|
#define TURN_ECHO_OFF(t) ((t).c_lflag &= ~ECHO)
|
|
#define TURN_ECHO_ON(t) ((t).c_lflag |= ECHO)
|
|
|
|
static struct termios t;
|
|
#endif /* BSD_TERMIO */
|
|
#endif /* SYSV_TERMIO */
|
|
|
|
char *getsmbpass(char *prompt)
|
|
{
|
|
FILE *in, *out;
|
|
int echo_off;
|
|
static char buf[256];
|
|
static size_t bufsize = sizeof(buf);
|
|
size_t nread;
|
|
|
|
/* Catch problematic signals */
|
|
signal(SIGINT, SIGNAL_CAST SIG_IGN);
|
|
|
|
/* Try to write to and read from the terminal if we can.
|
|
If we can't open the terminal, use stderr and stdin. */
|
|
|
|
in = fopen ("/dev/tty", "w+");
|
|
if (in == NULL)
|
|
{
|
|
in = stdin;
|
|
out = stderr;
|
|
}
|
|
else
|
|
out = in;
|
|
|
|
setvbuf(in, NULL, _IONBF, 0);
|
|
|
|
/* Turn echoing off if it is on now. */
|
|
|
|
if (tcgetattr (fileno (in), &t) == 0)
|
|
{
|
|
if (ECHO_IS_ON(t))
|
|
{
|
|
TURN_ECHO_OFF(t);
|
|
echo_off = tcsetattr (fileno (in), TCSAFLUSH, &t) == 0;
|
|
TURN_ECHO_ON(t);
|
|
}
|
|
else
|
|
echo_off = 0;
|
|
}
|
|
else
|
|
echo_off = 0;
|
|
|
|
/* Write the prompt. */
|
|
fputs (prompt, out);
|
|
fflush (out);
|
|
|
|
/* Read the password. */
|
|
buf[0] = 0;
|
|
fgets(buf, bufsize, in);
|
|
nread = strlen(buf);
|
|
if (buf[nread - 1] == '\n')
|
|
buf[nread - 1] = '\0';
|
|
|
|
/* Restore echoing. */
|
|
if (echo_off)
|
|
(void) tcsetattr (fileno (in), TCSANOW, &t);
|
|
|
|
if (in != stdin)
|
|
/* We opened the terminal; now close it. */
|
|
fclose (in);
|
|
|
|
/* Catch problematic signals */
|
|
signal(SIGINT, SIGNAL_CAST SIG_DFL);
|
|
|
|
printf("\n");
|
|
return buf;
|
|
}
|
|
|
|
#else
|
|
|
|
void getsmbpasswd_dummy() {;}
|
|
#endif
|