summaryrefslogtreecommitdiff
path: root/source3/lib/access.c
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>1996-08-14 15:02:28 +0000
committerAndrew Tridgell <tridge@samba.org>1996-08-14 15:02:28 +0000
commitebc96b7309dbce110ae63bcb91dd8ad5a2cadbbf (patch)
treef8677502a41e01ccf2b828d712e97faa62a32d2c /source3/lib/access.c
parent6475a9157464b132decbae2aee0f001a364c0dbe (diff)
downloadsamba-ebc96b7309dbce110ae63bcb91dd8ad5a2cadbbf.tar.gz
samba-ebc96b7309dbce110ae63bcb91dd8ad5a2cadbbf.tar.bz2
samba-ebc96b7309dbce110ae63bcb91dd8ad5a2cadbbf.zip
changed "unsigned long" to "uint32" in several places (for IP
addresses) to keep 64 bit machines happy. (This used to be commit b4aaec504ae66dc6a0f05d12529100cb62d47afd)
Diffstat (limited to 'source3/lib/access.c')
-rw-r--r--source3/lib/access.c28
1 files changed, 14 insertions, 14 deletions
diff --git a/source3/lib/access.c b/source3/lib/access.c
index 4d5954096f..079253cdbd 100644
--- a/source3/lib/access.c
+++ b/source3/lib/access.c
@@ -272,20 +272,20 @@ static int string_match(char *tok,char *s)
/* masked_match - match address against netnumber/netmask */
static int masked_match(char *tok, char *slash, char *s)
{
- unsigned long net;
- unsigned long mask;
- unsigned long addr;
-
- if ((addr = interpret_addr(s)) == INADDR_NONE)
- return (NO);
- *slash = 0;
- net = interpret_addr(tok);
- *slash = '/';
- if (net == INADDR_NONE || (mask = interpret_addr(slash + 1)) == INADDR_NONE) {
- DEBUG(0,("access: bad net/mask access control: %s", tok));
- return (NO);
- }
- return ((addr & mask) == net);
+ uint32 net;
+ uint32 mask;
+ uint32 addr;
+
+ if ((addr = interpret_addr(s)) == INADDR_NONE)
+ return (NO);
+ *slash = 0;
+ net = interpret_addr(tok);
+ *slash = '/';
+ if (net == INADDR_NONE || (mask = interpret_addr(slash + 1)) == INADDR_NONE) {
+ DEBUG(0,("access: bad net/mask access control: %s", tok));
+ return (NO);
+ }
+ return ((addr & mask) == net);
}