mirror of
https://github.com/samba-team/samba.git
synced 2025-01-11 05:18:09 +03:00
util_file.c:
split some routines out of various places (e.g smbpass.c) because
they now get used in more than one location.
util_sid.c:
need sid_copy, compare, split rid, append rid etc etc...
(This used to be commit 71dfaa307e)
This commit is contained in:
Luke Leighton
parent
8c3dcf128b
commit
613860a3aa
329
source3/lib/util_file.c
Normal file
329
source3/lib/util_file.c
Normal file
@ -0,0 +1,329 @@
|
||||
/*
|
||||
* Unix SMB/Netbios implementation. Version 1.9. SMB parameters and setup
|
||||
* Copyright (C) Andrew Tridgell 1992-1998 Modified by Jeremy Allison 1995.
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify it under
|
||||
* the terms of the GNU General Public License as published by the Free
|
||||
* Software Foundation; either version 2 of the License, or (at your option)
|
||||
* any later version.
|
||||
*
|
||||
* This program 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 General Public License for
|
||||
* more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License along with
|
||||
* this program; if not, write to the Free Software Foundation, Inc., 675
|
||||
* Mass Ave, Cambridge, MA 02139, USA.
|
||||
*/
|
||||
|
||||
#include "includes.h"
|
||||
|
||||
extern int DEBUGLEVEL;
|
||||
|
||||
static int gotalarm;
|
||||
|
||||
/***************************************************************
|
||||
Signal function to tell us we timed out.
|
||||
****************************************************************/
|
||||
|
||||
static void gotalarm_sig(void)
|
||||
{
|
||||
gotalarm = 1;
|
||||
}
|
||||
|
||||
/***************************************************************
|
||||
Lock or unlock a fd for a known lock type. Abandon after waitsecs
|
||||
seconds.
|
||||
****************************************************************/
|
||||
|
||||
BOOL do_file_lock(int fd, int waitsecs, int type)
|
||||
{
|
||||
SMB_STRUCT_FLOCK lock;
|
||||
int ret;
|
||||
|
||||
gotalarm = 0;
|
||||
CatchSignal(SIGALRM, SIGNAL_CAST gotalarm_sig);
|
||||
|
||||
lock.l_type = type;
|
||||
lock.l_whence = SEEK_SET;
|
||||
lock.l_start = 0;
|
||||
lock.l_len = 1;
|
||||
lock.l_pid = 0;
|
||||
|
||||
alarm(5);
|
||||
ret = fcntl(fd, SMB_F_SETLKW, &lock);
|
||||
alarm(0);
|
||||
CatchSignal(SIGALRM, SIGNAL_CAST SIG_DFL);
|
||||
|
||||
if (gotalarm) {
|
||||
DEBUG(0, ("do_file_lock: failed to %s file.\n",
|
||||
type == F_UNLCK ? "unlock" : "lock"));
|
||||
return False;
|
||||
}
|
||||
|
||||
return (ret == 0);
|
||||
}
|
||||
|
||||
|
||||
/***************************************************************
|
||||
Lock an fd. Abandon after waitsecs seconds.
|
||||
****************************************************************/
|
||||
|
||||
BOOL file_lock(int fd, int type, int secs, int *plock_depth)
|
||||
{
|
||||
if (fd < 0)
|
||||
return False;
|
||||
|
||||
(*plock_depth)++;
|
||||
|
||||
if ((*plock_depth) == 0)
|
||||
{
|
||||
if (!do_file_lock(fd, secs, type)) {
|
||||
DEBUG(10,("file_lock: locking file failed, error = %s.\n",
|
||||
strerror(errno)));
|
||||
return False;
|
||||
}
|
||||
}
|
||||
|
||||
return True;
|
||||
}
|
||||
|
||||
/***************************************************************
|
||||
Unlock an fd. Abandon after waitsecs seconds.
|
||||
****************************************************************/
|
||||
|
||||
BOOL file_unlock(int fd, int *plock_depth)
|
||||
{
|
||||
BOOL ret=True;
|
||||
|
||||
if(*plock_depth == 1)
|
||||
ret = do_file_lock(fd, 5, F_UNLCK);
|
||||
|
||||
(*plock_depth)--;
|
||||
|
||||
if(!ret)
|
||||
DEBUG(10,("file_unlock: unlocking file failed, error = %s.\n",
|
||||
strerror(errno)));
|
||||
return ret;
|
||||
}
|
||||
|
||||
/***************************************************************
|
||||
locks a file for enumeration / modification.
|
||||
update to be set = True if modification is required.
|
||||
****************************************************************/
|
||||
|
||||
void *startfilepwent(char *pfile, char *s_readbuf, int bufsize,
|
||||
int *file_lock_depth, BOOL update)
|
||||
{
|
||||
FILE *fp = NULL;
|
||||
|
||||
if (!*pfile)
|
||||
{
|
||||
DEBUG(0, ("startfilepwent: No file set\n"));
|
||||
return (NULL);
|
||||
}
|
||||
DEBUG(10, ("startfilepwent: opening file %s\n", pfile));
|
||||
|
||||
fp = fopen(pfile, update ? "r+b" : "rb");
|
||||
|
||||
if (fp == NULL) {
|
||||
DEBUG(0, ("startfilepwent: unable to open file %s\n", pfile));
|
||||
return NULL;
|
||||
}
|
||||
|
||||
/* Set a buffer to do more efficient reads */
|
||||
setvbuf(fp, s_readbuf, _IOFBF, bufsize);
|
||||
|
||||
if (!file_lock(fileno(fp), (update ? F_WRLCK : F_RDLCK), 5, file_lock_depth))
|
||||
{
|
||||
DEBUG(0, ("startfilepwent: unable to lock file %s\n", pfile));
|
||||
fclose(fp);
|
||||
return NULL;
|
||||
}
|
||||
|
||||
/* Make sure it is only rw by the owner */
|
||||
chmod(pfile, 0600);
|
||||
|
||||
/* We have a lock on the file. */
|
||||
return (void *)fp;
|
||||
}
|
||||
|
||||
/***************************************************************
|
||||
End enumeration of the file.
|
||||
****************************************************************/
|
||||
void endfilepwent(void *vp, int *file_lock_depth)
|
||||
{
|
||||
FILE *fp = (FILE *)vp;
|
||||
|
||||
file_unlock(fileno(fp), file_lock_depth);
|
||||
fclose(fp);
|
||||
DEBUG(7, ("endfilepwent: closed file.\n"));
|
||||
}
|
||||
|
||||
/*************************************************************************
|
||||
Return the current position in the file list as an SMB_BIG_UINT.
|
||||
This must be treated as an opaque token.
|
||||
*************************************************************************/
|
||||
SMB_BIG_UINT getfilepwpos(void *vp)
|
||||
{
|
||||
return (SMB_BIG_UINT)sys_ftell((FILE *)vp);
|
||||
}
|
||||
|
||||
/*************************************************************************
|
||||
Set the current position in the file list from an SMB_BIG_UINT.
|
||||
This must be treated as an opaque token.
|
||||
*************************************************************************/
|
||||
BOOL setfilepwpos(void *vp, SMB_BIG_UINT tok)
|
||||
{
|
||||
return !sys_fseek((FILE *)vp, (SMB_OFF_T)tok, SEEK_SET);
|
||||
}
|
||||
|
||||
/*************************************************************************
|
||||
gets a line out of a file.
|
||||
line is of format "xxxx:xxxxxx:xxxxx:".
|
||||
lines with "#" at the front are ignored.
|
||||
*************************************************************************/
|
||||
int getfileline(void *vp, char *linebuf, int linebuf_size)
|
||||
{
|
||||
/* Static buffers we will return. */
|
||||
FILE *fp = (FILE *)vp;
|
||||
unsigned char c;
|
||||
unsigned char *p;
|
||||
size_t linebuf_len;
|
||||
|
||||
if (fp == NULL)
|
||||
{
|
||||
DEBUG(0,("getfileline: Bad file pointer.\n"));
|
||||
return -1;
|
||||
}
|
||||
|
||||
/*
|
||||
* Scan the file, a line at a time.
|
||||
*/
|
||||
while (!feof(fp))
|
||||
{
|
||||
linebuf[0] = '\0';
|
||||
|
||||
fgets(linebuf, linebuf_size, fp);
|
||||
if (ferror(fp))
|
||||
{
|
||||
return -1;
|
||||
}
|
||||
|
||||
/*
|
||||
* Check if the string is terminated with a newline - if not
|
||||
* then we must keep reading and discard until we get one.
|
||||
*/
|
||||
|
||||
linebuf_len = strlen(linebuf);
|
||||
if (linebuf[linebuf_len - 1] != '\n')
|
||||
{
|
||||
c = '\0';
|
||||
while (!ferror(fp) && !feof(fp))
|
||||
{
|
||||
c = fgetc(fp);
|
||||
if (c == '\n')
|
||||
{
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
linebuf[linebuf_len - 1] = '\0';
|
||||
}
|
||||
|
||||
#ifdef DEBUG_PASSWORD
|
||||
DEBUG(100, ("getfileline: got line |%s|\n", linebuf));
|
||||
#endif
|
||||
if ((linebuf[0] == 0) && feof(fp))
|
||||
{
|
||||
DEBUG(4, ("getfileline: end of file reached\n"));
|
||||
return 0;
|
||||
}
|
||||
|
||||
if (linebuf[0] == '#' || linebuf[0] == '\0')
|
||||
{
|
||||
DEBUG(6, ("getfileline: skipping comment or blank line\n"));
|
||||
continue;
|
||||
}
|
||||
|
||||
p = (unsigned char *) strchr(linebuf, ':');
|
||||
if (p == NULL)
|
||||
{
|
||||
DEBUG(0, ("getfileline: malformed line entry (no :)\n"));
|
||||
continue;
|
||||
}
|
||||
return linebuf_len;
|
||||
}
|
||||
return -1;
|
||||
}
|
||||
|
||||
|
||||
/****************************************************************************
|
||||
read a line from a file with possible \ continuation chars.
|
||||
Blanks at the start or end of a line are stripped.
|
||||
The string will be allocated if s2 is NULL
|
||||
****************************************************************************/
|
||||
char *fgets_slash(char *s2,int maxlen,FILE *f)
|
||||
{
|
||||
char *s=s2;
|
||||
int len = 0;
|
||||
int c;
|
||||
BOOL start_of_line = True;
|
||||
|
||||
if (feof(f))
|
||||
return(NULL);
|
||||
|
||||
if (!s2)
|
||||
{
|
||||
maxlen = MIN(maxlen,8);
|
||||
s = (char *)Realloc(s,maxlen);
|
||||
}
|
||||
|
||||
if (!s || maxlen < 2) return(NULL);
|
||||
|
||||
*s = 0;
|
||||
|
||||
while (len < maxlen-1)
|
||||
{
|
||||
c = getc(f);
|
||||
switch (c)
|
||||
{
|
||||
case '\r':
|
||||
break;
|
||||
case '\n':
|
||||
while (len > 0 && s[len-1] == ' ')
|
||||
{
|
||||
s[--len] = 0;
|
||||
}
|
||||
if (len > 0 && s[len-1] == '\\')
|
||||
{
|
||||
s[--len] = 0;
|
||||
start_of_line = True;
|
||||
break;
|
||||
}
|
||||
return(s);
|
||||
case EOF:
|
||||
if (len <= 0 && !s2)
|
||||
free(s);
|
||||
return(len>0?s:NULL);
|
||||
case ' ':
|
||||
if (start_of_line)
|
||||
break;
|
||||
default:
|
||||
start_of_line = False;
|
||||
s[len++] = c;
|
||||
s[len] = 0;
|
||||
}
|
||||
if (!s2 && len > maxlen-3)
|
||||
{
|
||||
maxlen *= 2;
|
||||
s = (char *)Realloc(s,maxlen);
|
||||
if (!s) return(NULL);
|
||||
}
|
||||
}
|
||||
return(s);
|
||||
}
|
||||
|
||||
178
source3/lib/util_sid.c
Normal file
178
source3/lib/util_sid.c
Normal file
@ -0,0 +1,178 @@
|
||||
/*
|
||||
Unix SMB/Netbios implementation.
|
||||
Version 1.9.
|
||||
Samba utility functions
|
||||
Copyright (C) Andrew Tridgell 1992-1998
|
||||
|
||||
This program is free software; you can redistribute it and/or modify
|
||||
it under the terms of the GNU General Public License as published by
|
||||
the Free Software Foundation; either version 2 of the License, or
|
||||
(at your option) any later version.
|
||||
|
||||
This program 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 General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU General Public License
|
||||
along with this program; if not, write to the Free Software
|
||||
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
|
||||
*/
|
||||
|
||||
#include "includes.h"
|
||||
|
||||
|
||||
extern int DEBUGLEVEL;
|
||||
|
||||
|
||||
/*****************************************************************
|
||||
Convert a SID to an ascii string.
|
||||
*****************************************************************/
|
||||
|
||||
char *sid_to_string(pstring sidstr_out, DOM_SID *sid)
|
||||
{
|
||||
char subauth[16];
|
||||
int i;
|
||||
/* BIG NOTE: this function only does SIDS where the identauth is not >= 2^32 */
|
||||
uint32 ia = (sid->id_auth[5]) +
|
||||
(sid->id_auth[4] << 8 ) +
|
||||
(sid->id_auth[3] << 16) +
|
||||
(sid->id_auth[2] << 24);
|
||||
|
||||
slprintf(sidstr_out, sizeof(pstring) - 1, "S-%d-%d", sid->sid_rev_num, ia);
|
||||
|
||||
for (i = 0; i < sid->num_auths; i++)
|
||||
{
|
||||
slprintf(subauth, sizeof(subauth)-1, "-%d", sid->sub_auths[i]);
|
||||
pstrcat(sidstr_out, subauth);
|
||||
}
|
||||
|
||||
DEBUG(7,("sid_to_string returning %s\n", sidstr_out));
|
||||
return sidstr_out;
|
||||
}
|
||||
|
||||
/*****************************************************************
|
||||
Convert a string to a SID. Returns True on success, False on fail.
|
||||
*****************************************************************/
|
||||
|
||||
BOOL string_to_sid(DOM_SID *sidout, char *sidstr)
|
||||
{
|
||||
pstring tok;
|
||||
char *p = sidstr;
|
||||
/* BIG NOTE: this function only does SIDS where the identauth is not >= 2^32 */
|
||||
uint32 ia;
|
||||
|
||||
memset((char *)sidout, '\0', sizeof(DOM_SID));
|
||||
|
||||
if (StrnCaseCmp( sidstr, "S-", 2)) {
|
||||
DEBUG(0,("string_to_sid: Sid %s does not start with 'S-'.\n", sidstr));
|
||||
return False;
|
||||
}
|
||||
|
||||
p += 2;
|
||||
if (!next_token(&p, tok, "-", sizeof(tok))) {
|
||||
DEBUG(0,("string_to_sid: Sid %s is not in a valid format.\n", sidstr));
|
||||
return False;
|
||||
}
|
||||
|
||||
/* Get the revision number. */
|
||||
sidout->sid_rev_num = atoi(tok);
|
||||
|
||||
if (!next_token(&p, tok, "-", sizeof(tok))) {
|
||||
DEBUG(0,("string_to_sid: Sid %s is not in a valid format.\n", sidstr));
|
||||
return False;
|
||||
}
|
||||
|
||||
/* identauth in decimal should be < 2^32 */
|
||||
ia = atoi(tok);
|
||||
|
||||
/* NOTE - the ia value is in big-endian format. */
|
||||
sidout->id_auth[0] = 0;
|
||||
sidout->id_auth[1] = 0;
|
||||
sidout->id_auth[2] = (ia & 0xff000000) >> 24;
|
||||
sidout->id_auth[3] = (ia & 0x00ff0000) >> 16;
|
||||
sidout->id_auth[4] = (ia & 0x0000ff00) >> 8;
|
||||
sidout->id_auth[5] = (ia & 0x000000ff);
|
||||
|
||||
sidout->num_auths = 0;
|
||||
|
||||
while(next_token(&p, tok, "-", sizeof(tok)) &&
|
||||
sidout->num_auths < MAXSUBAUTHS)
|
||||
{
|
||||
/*
|
||||
* NOTE - the subauths are in native machine-endian format. They
|
||||
* are converted to little-endian when linearized onto the wire.
|
||||
*/
|
||||
sid_append_rid(sidout, atoi(tok));
|
||||
}
|
||||
|
||||
DEBUG(7,("string_to_sid: converted SID %s ok\n", sidstr));
|
||||
|
||||
return True;
|
||||
}
|
||||
|
||||
/*****************************************************************
|
||||
add a rid to the end of a sid
|
||||
*****************************************************************/
|
||||
BOOL sid_append_rid(DOM_SID *sid, uint32 rid)
|
||||
{
|
||||
if (sid->num_auths < MAXSUBAUTHS)
|
||||
{
|
||||
sid->sub_auths[sid->num_auths++] = rid;
|
||||
return True;
|
||||
}
|
||||
return False;
|
||||
}
|
||||
|
||||
/*****************************************************************
|
||||
removes the last rid from the end of a sid
|
||||
*****************************************************************/
|
||||
BOOL sid_split_rid(DOM_SID *sid, uint32 *rid)
|
||||
{
|
||||
if (sid->num_auths > 0)
|
||||
{
|
||||
sid->num_auths--;
|
||||
(*rid) = sid->sub_auths[sid->num_auths];
|
||||
return True;
|
||||
}
|
||||
return False;
|
||||
}
|
||||
|
||||
/*****************************************************************
|
||||
copies a sid
|
||||
*****************************************************************/
|
||||
void sid_copy(DOM_SID *sid1, DOM_SID *sid2)
|
||||
{
|
||||
int i;
|
||||
|
||||
for (i = 0; i < sid2->num_auths; i++)
|
||||
{
|
||||
sid1->sub_auths[i] = sid2->sub_auths[i];
|
||||
}
|
||||
|
||||
sid1->num_auths = sid2->num_auths;
|
||||
sid1->sid_rev_num = sid2->sid_rev_num;
|
||||
}
|
||||
/*****************************************************************
|
||||
compare two sids
|
||||
*****************************************************************/
|
||||
BOOL sid_equal(DOM_SID *sid1, DOM_SID *sid2)
|
||||
{
|
||||
int i;
|
||||
|
||||
/* compare most likely different rids, first: i.e start at end */
|
||||
for (i = sid1->num_auths-1; i >= 0; --i)
|
||||
{
|
||||
if (sid1->sub_auths[i] != sid2->sub_auths[i]) return False;
|
||||
}
|
||||
|
||||
if (sid1->num_auths != sid2->num_auths ) return False;
|
||||
if (sid1->sid_rev_num != sid2->sid_rev_num) return False;
|
||||
|
||||
for (i = 0; i < 6; i++)
|
||||
{
|
||||
if (sid1->id_auth[i] != sid2->id_auth[i]) return False;
|
||||
}
|
||||
|
||||
return True;
|
||||
}
|
||||
Loading…
Reference in New Issue
Block a user